Merge tag 'fbdev-updates-for-3.5' of git://github.com/schandinat/linux-2.6

[~andy/linux] / drivers / input / joystick / iforce / iforce-usb.c

diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index 6c96631ae5d9faff42fbe8e21969e78fca1133f4..d96aa27dfcdc9776260c72753b48b63691af1b04 100644 (file)
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -64,7 +64,7 @@ void iforce_usb_xmit(struct iforce *iforce)
 
        if ( (n=usb_submit_urb(iforce->out, GFP_ATOMIC)) ) {
                clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags);
-               dev_warn(&iforce->dev->dev, "usb_submit_urb failed %d\n", n);
+               dev_warn(&iforce->intf->dev, "usb_submit_urb failed %d\n", n);
        }
 
        /* The IFORCE_XMIT_RUNNING bit is not cleared here. That's intended.
@@ -76,6 +76,7 @@ void iforce_usb_xmit(struct iforce *iforce)
 static void iforce_usb_irq(struct urb *urb)
 {
        struct iforce *iforce = urb->context;
+       struct device *dev = &iforce->intf->dev;
        int status;
 
        switch (urb->status) {
@@ -86,11 +87,12 @@ static void iforce_usb_irq(struct urb *urb)
        case -ENOENT:
        case -ESHUTDOWN:
                /* this urb is terminated, clean up */
-               dbg("%s - urb shutting down with status: %d",
-                   __func__, urb->status);
+               dev_dbg(dev, "%s - urb shutting down with status: %d\n",
+                       __func__, urb->status);
                return;
        default:
-               dbg("%s - urb has status of: %d", __func__, urb->status);
+               dev_dbg(dev, "%s - urb has status of: %d\n",
+                       __func__, urb->status);
                goto exit;
        }
 
@@ -100,8 +102,8 @@ static void iforce_usb_irq(struct urb *urb)
 exit:
        status = usb_submit_urb (urb, GFP_ATOMIC);
        if (status)
-               err ("%s - usb_submit_urb failed with result %d",
-                    __func__, status);
+               dev_err(dev, "%s - usb_submit_urb failed with result %d\n",
+                       __func__, status);
 }
 
 static void iforce_usb_out(struct urb *urb)
@@ -110,7 +112,8 @@ static void iforce_usb_out(struct urb *urb)
 
        if (urb->status) {
                clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags);
-               dbg("urb->status %d, exiting", urb->status);
+               dev_dbg(&iforce->intf->dev, "urb->status %d, exiting\n",
+                       urb->status);
                return;
        }
 
@@ -155,6 +158,7 @@ static int iforce_usb_probe(struct usb_interface *intf,
 
        iforce->bus = IFORCE_USB;
        iforce->usbdev = dev;
+       iforce->intf = intf;
 
        iforce->cr.bRequestType = USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_INTERFACE;
        iforce->cr.wIndex = 0;