Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

USB: input: bcm5974.c: fix up dev_err() usage

Browse source 
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>
This commit is contained in:
Greg Kroah-Hartman 2012-05-01 20:56:47 -04:00
parent 80f8594f63
commit 140b1230a1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/input/mouse/bcm5974.c
View file

@ -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);
}
/*