diff options
Diffstat (limited to 'drivers/input/misc/powermate.c')
| -rw-r--r-- | drivers/input/misc/powermate.c | 13 | 
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c index 538f7049ec6..49c0c3ebd32 100644 --- a/drivers/input/misc/powermate.c +++ b/drivers/input/misc/powermate.c @@ -65,6 +65,7 @@ struct powermate_device {  	struct urb *irq, *config;  	struct usb_ctrlrequest *configcr;  	struct usb_device *udev; +	struct usb_interface *intf;  	struct input_dev *input;  	spinlock_t lock;  	int static_brightness; @@ -85,6 +86,7 @@ static void powermate_config_complete(struct urb *urb);  static void powermate_irq(struct urb *urb)  {  	struct powermate_device *pm = urb->context; +	struct device *dev = &pm->intf->dev;  	int retval;  	switch (urb->status) { @@ -95,10 +97,12 @@ static void powermate_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 - nonzero urb status received: %d", __func__, urb->status); +		dev_dbg(dev, "%s - nonzero urb status received: %d\n", +			__func__, urb->status);  		goto exit;  	} @@ -110,8 +114,8 @@ static void powermate_irq(struct urb *urb)  exit:  	retval = usb_submit_urb (urb, GFP_ATOMIC);  	if (retval) -		err ("%s - usb_submit_urb failed with result %d", -		     __func__, retval); +		dev_err(dev, "%s - usb_submit_urb failed with result: %d\n", +			__func__, retval);  }  /* Decide if we need to issue a control message and do so. Must be called with pm->lock taken */ @@ -330,6 +334,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i  		goto fail3;  	pm->udev = udev; +	pm->intf = intf;  	pm->input = input_dev;  	usb_make_path(udev, pm->phys, sizeof(pm->phys));  |