diff options
Diffstat (limited to 'drivers/memstick/host/tifm_ms.c')
-rw-r--r-- | drivers/memstick/host/tifm_ms.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/memstick/host/tifm_ms.c b/drivers/memstick/host/tifm_ms.c index d32d6ad8f3fc..03f71a431c82 100644 --- a/drivers/memstick/host/tifm_ms.c +++ b/drivers/memstick/host/tifm_ms.c | |||
@@ -546,7 +546,7 @@ static void tifm_ms_abort(unsigned long data) | |||
546 | printk(KERN_ERR | 546 | printk(KERN_ERR |
547 | "%s : card failed to respond for a long period of time " | 547 | "%s : card failed to respond for a long period of time " |
548 | "(%x, %x)\n", | 548 | "(%x, %x)\n", |
549 | host->dev->dev.bus_id, host->req ? host->req->tpc : 0, | 549 | dev_name(&host->dev->dev), host->req ? host->req->tpc : 0, |
550 | host->cmd_flags); | 550 | host->cmd_flags); |
551 | 551 | ||
552 | tifm_eject(host->dev); | 552 | tifm_eject(host->dev); |
@@ -561,7 +561,7 @@ static int tifm_ms_probe(struct tifm_dev *sock) | |||
561 | if (!(TIFM_SOCK_STATE_OCCUPIED | 561 | if (!(TIFM_SOCK_STATE_OCCUPIED |
562 | & readl(sock->addr + SOCK_PRESENT_STATE))) { | 562 | & readl(sock->addr + SOCK_PRESENT_STATE))) { |
563 | printk(KERN_WARNING "%s : card gone, unexpectedly\n", | 563 | printk(KERN_WARNING "%s : card gone, unexpectedly\n", |
564 | sock->dev.bus_id); | 564 | dev_name(&sock->dev)); |
565 | return rc; | 565 | return rc; |
566 | } | 566 | } |
567 | 567 | ||