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) |
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 137326a5c2a..68f5f1e2d73 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) | |||
257 | 257 | ||
258 | status = usb_submit_urb(iforce->ctrl, GFP_ATOMIC); | 258 | status = usb_submit_urb(iforce->ctrl, GFP_ATOMIC); |
259 | if (status) { | 259 | if (status) { |
260 | dev_err(&iforce->usbdev->dev, | 260 | dev_err(&iforce->dev->dev, |
261 | "usb_submit_urb failed %d\n", status); | 261 | "usb_submit_urb failed %d\n", status); |
262 | return -1; | 262 | return -1; |
263 | } | 263 | } |
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c index ecbfae7d753..86d3538e104 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) | |||
100 | exit: | 100 | exit: |
101 | status = usb_submit_urb (urb, GFP_ATOMIC); | 101 | status = usb_submit_urb (urb, GFP_ATOMIC); |
102 | if (status) | 102 | if (status) |
103 | dev_err(&iforce->usbdev->dev, | 103 | dev_err(&iforce->dev->dev, |
104 | "%s - usb_submit_urb failed with result %d\n", | 104 | "%s - usb_submit_urb failed with result %d\n", |
105 | __func__, status); | 105 | __func__, status); |
106 | } | 106 | } |