Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[~andy/linux] / drivers / input / tablet / acecad.c

diff --git a/drivers/input/tablet/acecad.c b/drivers/input/tablet/acecad.c
index f8b0b1df91382db9cb161d80ae4e2e7047e9c02d..e062ec899ca110d18a1824608a41ea22e435d531 100644 (file)
--- a/drivers/input/tablet/acecad.c
+++ b/drivers/input/tablet/acecad.c
@@ -51,6 +51,7 @@ struct usb_acecad {
        char name[128];
        char phys[64];
        struct usb_device *usbdev;
+       struct usb_interface *intf;
        struct input_dev *input;
        struct urb *irq;
 
@@ -63,6 +64,7 @@ static void usb_acecad_irq(struct urb *urb)
        struct usb_acecad *acecad = urb->context;
        unsigned char *data = acecad->data;
        struct input_dev *dev = acecad->input;
+       struct usb_interface *intf = acecad->intf;
        int prox, status;
 
        switch (urb->status) {
@@ -73,10 +75,12 @@ static void usb_acecad_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(&intf->dev, "%s - urb shutting down with status: %d\n",
+                       __func__, urb->status);
                return;
        default:
-               dbg("%s - nonzero urb status received: %d", __func__, urb->status);
+               dev_dbg(&intf->dev, "%s - nonzero urb status received: %d\n",
+                       __func__, urb->status);
                goto resubmit;
        }
 
@@ -105,8 +109,10 @@ static void usb_acecad_irq(struct urb *urb)
 resubmit:
        status = usb_submit_urb(urb, GFP_ATOMIC);
        if (status)
-               err("can't resubmit intr, %s-%s/input0, status %d",
-                       acecad->usbdev->bus->bus_name, acecad->usbdev->devpath, status);
+               dev_err(&intf->dev,
+                       "can't resubmit intr, %s-%s/input0, status %d\n",
+                       acecad->usbdev->bus->bus_name,
+                       acecad->usbdev->devpath, status);
 }
 
 static int usb_acecad_open(struct input_dev *dev)
@@ -168,6 +174,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
        }
 
        acecad->usbdev = dev;
+       acecad->intf = intf;
        acecad->input = input_dev;
 
        if (dev->manufacturer)