Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / drivers / s390 / cio / device_ops.c

diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index ee1a28310fbb11945c07714fc9dfef94b4a20752..eabcc42d63df17ca5bfc9afd89a1b6211b92f61a 100644 (file)
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -498,7 +498,7 @@ ccw_device_stlck(struct ccw_device *cdev)
        sch = to_subchannel(cdev->dev.parent);
        
        CIO_TRACE_EVENT(2, "stl lock");
-       CIO_TRACE_EVENT(2, cdev->dev.bus_id);
+       CIO_TRACE_EVENT(2, dev_name(&cdev->dev));
 
        buf = kmalloc(32*sizeof(char), GFP_DMA|GFP_KERNEL);
        if (!buf)