USB: input: kbtab.c: fix up dev_* messages

[linux-beck.git] / drivers / input / tablet / kbtab.c

diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c
index be717d758cb25a2c894ecf893e875396f30e0657..3fba74b9b602be947e03a00aad198fd7ca658bf3 100644 (file)
--- a/drivers/input/tablet/kbtab.c
+++ b/drivers/input/tablet/kbtab.c
@@ -33,6 +33,7 @@ struct kbtab {
        dma_addr_t data_dma;
        struct input_dev *dev;
        struct usb_device *usbdev;
+       struct usb_interface *intf;
        struct urb *irq;
        char phys[32];
 };
@@ -53,10 +54,14 @@ static void kbtab_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(&kbtab->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(&kbtab->intf->dev,
+                       "%s - nonzero urb status received: %d\n",
+                       __func__, urb->status);
                goto exit;
        }
 
@@ -80,7 +85,7 @@ static void kbtab_irq(struct urb *urb)
  exit:
        retval = usb_submit_urb(urb, GFP_ATOMIC);
        if (retval)
-               dev_err(&dev->dev,
+               dev_err(&kbtab->intf->dev,
                        "%s - usb_submit_urb failed with result %d\n",
                        __func__, retval);
 }
@@ -132,6 +137,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
                goto fail2;
 
        kbtab->usbdev = dev;
+       kbtab->intf = intf;
        kbtab->dev = input_dev;
 
        usb_make_path(dev, kbtab->phys, sizeof(kbtab->phys));