Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[net-next-2.6.git] / drivers / media / video / usbvision / usbvision-video.c

diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 6248a639ba2d2ab6e097f5770a5f2b69fec643b1..c2690df33438bd65190157dc88c20e4164ad2caa 100644 (file)
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -1671,8 +1671,7 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf)
        PDEBUG(DBG_PROBE, "");
 
        if (usbvision == NULL) {
-               dev_err(&usbvision->dev->dev,
-                       "%s: usb_get_intfdata() failed\n", __func__);
+               pr_err("%s: usb_get_intfdata() failed\n", __func__);
                return;
        }