From: Andrew Morton Cc: Alex Dubov Signed-off-by: Andrew Morton --- drivers/memstick/host/tifm_ms.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/memstick/host/tifm_ms.c~revert-linux-next-changes-to-make-memstick-use-fully-asynchronous-request-processing-apply drivers/memstick/host/tifm_ms.c --- a/drivers/memstick/host/tifm_ms.c~revert-linux-next-changes-to-make-memstick-use-fully-asynchronous-request-processing-apply +++ a/drivers/memstick/host/tifm_ms.c @@ -465,7 +465,7 @@ static void tifm_ms_request(struct memst spin_lock_irqsave(&sock->lock, flags); if (host->req) { printk(KERN_ERR "%s : unfinished request detected\n", - dev_name(&sock->dev)); + sock->dev.bus_id); spin_unlock_irqrestore(&sock->lock, flags); tifm_eject(host->dev); return; @@ -540,7 +540,7 @@ static void tifm_ms_abort(unsigned long printk(KERN_ERR "%s : card failed to respond for a long period of time " "(%x, %x)\n", - dev_name(&host->dev->dev), host->req ? host->req->tpc : 0, + host->dev->dev.bus_id, host->req ? host->req->tpc : 0, host->cmd_flags); tifm_eject(host->dev); @@ -555,7 +555,7 @@ static int tifm_ms_probe(struct tifm_dev if (!(TIFM_SOCK_STATE_OCCUPIED & readl(sock->addr + SOCK_PRESENT_STATE))) { printk(KERN_WARNING "%s : card gone, unexpectedly\n", - dev_name(&sock->dev)); + sock->dev.bus_id); return rc; } _