diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-01 18:40:57 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-01 18:40:57 -0400 |
| commit | d331efdd993f4c392f5f63f970b3a55996e3a959 (patch) | |
| tree | eb7c3afa7c4ad457f52520c9358fb51a646872e0 /drivers/input/joystick | |
| parent | ade749a6bde26511925c888d734c989c5bbec919 (diff) | |
| download | blackbird-op-linux-d331efdd993f4c392f5f63f970b3a55996e3a959.tar.gz blackbird-op-linux-d331efdd993f4c392f5f63f970b3a55996e3a959.zip | |
USB: input: joystick: iforce: fix up dev_err() usages
We should always reference the input device for dev_err(), not the USB
device. Fix up the places where I got this wrong.
Reported-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input/joystick')
| -rw-r--r-- | drivers/input/joystick/iforce/iforce-packets.c | 2 | ||||
| -rw-r--r-- | drivers/input/joystick/iforce/iforce-usb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c index 137326a5c2aa..68f5f1e2d73b 100644 --- a/drivers/input/joystick/iforce/iforce-packets.c +++ b/drivers/input/joystick/iforce/iforce-packets.c @@ -257,7 +257,7 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet) status = usb_submit_urb(iforce->ctrl, GFP_ATOMIC); if (status) { - dev_err(&iforce->usbdev->dev, + dev_err(&iforce->dev->dev, "usb_submit_urb failed %d\n", status); return -1; } diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c index ecbfae7d7539..86d3538e104d 100644 --- a/drivers/input/joystick/iforce/iforce-usb.c +++ b/drivers/input/joystick/iforce/iforce-usb.c @@ -100,7 +100,7 @@ static void iforce_usb_irq(struct urb *urb) exit: status = usb_submit_urb (urb, GFP_ATOMIC); if (status) - dev_err(&iforce->usbdev->dev, + dev_err(&iforce->dev->dev, "%s - usb_submit_urb failed with result %d\n", __func__, status); } |
