diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-17 12:01:12 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-17 12:01:12 +0100 |
| commit | d1a020050c6ce1a0794ff73582ccf47e4db536f7 (patch) | |
| tree | 1b7250410f24703cd77c76156e758db9887137aa /drivers/base/isa.c | |
| parent | ALSA: rename "Device" to "Toshiba SB-0500" via quirks (diff) | |
| parent | ALSA: usb-audio - Cache mixer values (diff) | |
| download | linux-d1a020050c6ce1a0794ff73582ccf47e4db536f7.tar.xz linux-d1a020050c6ce1a0794ff73582ccf47e4db536f7.zip | |
Merge branch 'topic/usb-mixer-cache' into next/usb-audio
Diffstat (limited to 'drivers/base/isa.c')
| -rw-r--r-- | drivers/base/isa.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/base/isa.c b/drivers/base/isa.c index efd577574948..479694b6cbe3 100644 --- a/drivers/base/isa.c +++ b/drivers/base/isa.c @@ -11,7 +11,7 @@ #include <linux/isa.h> static struct device isa_bus = { - .bus_id = "isa" + .init_name = "isa" }; struct isa_dev { @@ -135,9 +135,8 @@ int isa_register_driver(struct isa_driver *isa_driver, unsigned int ndev) isa_dev->dev.parent = &isa_bus; isa_dev->dev.bus = &isa_bus_type; - snprintf(isa_dev->dev.bus_id, BUS_ID_SIZE, "%s.%u", - isa_driver->driver.name, id); - + dev_set_name(&isa_dev->dev, "%s.%u", + isa_driver->driver.name, id); isa_dev->dev.platform_data = isa_driver; isa_dev->dev.release = isa_dev_release; isa_dev->id = id; |