diff --git a/[refs] b/[refs] index c4c050e2727c..2acd74186426 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4efeca581bc84105c2e82d28a3a29e6cd9784204 +refs/heads/master: 2385f3c3c757b6ffb766c320df4a7f7a45593f24 diff --git a/trunk/drivers/input/misc/powermate.c b/trunk/drivers/input/misc/powermate.c index 538f7049ec64..71ec621fbefa 100644 --- a/trunk/drivers/input/misc/powermate.c +++ b/trunk/drivers/input/misc/powermate.c @@ -110,8 +110,9 @@ 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(&pm->udev->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 */