diff options
Diffstat (limited to 'drivers/memstick/core/memstick.c')
-rw-r--r-- | drivers/memstick/core/memstick.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c index cea46906408..a5b448ea4ea 100644 --- a/drivers/memstick/core/memstick.c +++ b/drivers/memstick/core/memstick.c | |||
@@ -385,8 +385,7 @@ static struct memstick_dev *memstick_alloc_card(struct memstick_host *host) | |||
385 | 385 | ||
386 | if (card) { | 386 | if (card) { |
387 | card->host = host; | 387 | card->host = host; |
388 | snprintf(card->dev.bus_id, sizeof(card->dev.bus_id), | 388 | dev_set_name(&card->dev, "%s", dev_name(&host->dev)); |
389 | "%s", host->dev.bus_id); | ||
390 | card->dev.parent = &host->dev; | 389 | card->dev.parent = &host->dev; |
391 | card->dev.bus = &memstick_bus_type; | 390 | card->dev.bus = &memstick_bus_type; |
392 | card->dev.release = memstick_free_card; | 391 | card->dev.release = memstick_free_card; |
@@ -519,7 +518,7 @@ int memstick_add_host(struct memstick_host *host) | |||
519 | if (rc) | 518 | if (rc) |
520 | return rc; | 519 | return rc; |
521 | 520 | ||
522 | snprintf(host->dev.bus_id, BUS_ID_SIZE, "memstick%u", host->id); | 521 | dev_set_name(&host->dev, "memstick%u", host->id); |
523 | 522 | ||
524 | rc = device_add(&host->dev); | 523 | rc = device_add(&host->dev); |
525 | if (rc) { | 524 | if (rc) { |