summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-01 20:56:47 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-01 20:56:47 -0400
commit140b1230a19b65489317271da36465e42865f2e4 (patch)
treeacbc95c74b6558bce80ddc61cc3212c0ee8d1692 /drivers
parent80f8594f63dd35179235aa22901dfa5ce786fe00 (diff)
downloadblackbird-op-linux-140b1230a19b65489317271da36465e42865f2e4.tar.gz
blackbird-op-linux-140b1230a19b65489317271da36465e42865f2e4.zip
USB: input: bcm5974.c: fix up dev_err() usage
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> CC: Henrik Rydberg <rydberg@euromail.se> CC: Alessandro Rubini <rubini@ipvvis.unipv.it> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/mouse/bcm5974.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index 8cd7c932c202..e2e8d815da76 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -584,7 +584,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
int retval = 0, size;
if (!data) {
- dev_err(&dev->intf->dev, "out of memory\n");
+ dev_err(&dev->input->dev, "out of memory\n");
retval = -ENOMEM;
goto out;
}
@@ -597,7 +597,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);
if (size != 8) {
- dev_err(&dev->intf->dev, "could not read from device\n");
+ dev_err(&dev->input->dev, "could not read from device\n");
retval = -EIO;
goto out;
}
@@ -615,7 +615,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);
if (size != 8) {
- dev_err(&dev->intf->dev, "could not write to device\n");
+ dev_err(&dev->input->dev, "could not write to device\n");
retval = -EIO;
goto out;
}
@@ -654,7 +654,7 @@ static void bcm5974_irq_button(struct urb *urb)
exit:
error = usb_submit_urb(dev->bt_urb, GFP_ATOMIC);
if (error)
- dev_err(&dev->intf->dev, "button urb failed: %d\n", error);
+ dev_err(&dev->input->dev, "button urb failed: %d\n", error);
}
static void bcm5974_irq_trackpad(struct urb *urb)
@@ -687,7 +687,7 @@ static void bcm5974_irq_trackpad(struct urb *urb)
exit:
error = usb_submit_urb(dev->tp_urb, GFP_ATOMIC);
if (error)
- dev_err(&dev->intf->dev, "trackpad urb failed: %d\n", error);
+ dev_err(&dev->input->dev, "trackpad urb failed: %d\n", error);
}
/*
OpenPOWER on IntegriCloud