diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
| commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
| tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /drivers/isdn | |
| parent | b8c31da64165b8566fc6e1c9c826f76e7b98ff02 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/mISDN/dsp_pipeline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/mISDN/dsp_pipeline.c b/drivers/isdn/mISDN/dsp_pipeline.c index 5ee6651b45b9..83639be7f7ad 100644 --- a/drivers/isdn/mISDN/dsp_pipeline.c +++ b/drivers/isdn/mISDN/dsp_pipeline.c | |||
| @@ -91,7 +91,7 @@ int mISDN_dsp_element_register(struct mISDN_dsp_element *elem) | |||
| 91 | 91 | ||
| 92 | entry->dev.class = elements_class; | 92 | entry->dev.class = elements_class; |
| 93 | dev_set_drvdata(&entry->dev, elem); | 93 | dev_set_drvdata(&entry->dev, elem); |
| 94 | snprintf(entry->dev.bus_id, BUS_ID_SIZE, elem->name); | 94 | dev_set_name(&entry->dev, elem->name); |
| 95 | ret = device_register(&entry->dev); | 95 | ret = device_register(&entry->dev); |
| 96 | if (ret) { | 96 | if (ret) { |
| 97 | printk(KERN_ERR "%s: failed to register %s\n", | 97 | printk(KERN_ERR "%s: failed to register %s\n", |