summaryrefslogtreecommitdiffstats
path: root/drivers/input/tablet
diff options
context:
space:
mode:
authorMartin Kepplinger <martink@posteo.de>2016-07-19 14:13:02 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-07-19 14:33:04 -0700
commit168c1398e0660eafd70597a06cdd68c179e8f30b (patch)
tree7849bc776cddd60f9a0ae90021a1cf0dd5fe3bae /drivers/input/tablet
parent3746e5675211104844310a918fc2bf583f4a01b4 (diff)
downloadlinux-168c1398e0660eafd70597a06cdd68c179e8f30b.tar.gz
linux-168c1398e0660eafd70597a06cdd68c179e8f30b.tar.bz2
linux-168c1398e0660eafd70597a06cdd68c179e8f30b.zip
Input: pegasus_notetaker - handle usb control msg errors
Signed-off-by: Martin Kepplinger <martink@posteo.de> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/tablet')
-rw-r--r--drivers/input/tablet/pegasus_notetaker.c29
1 files changed, 20 insertions, 9 deletions
diff --git a/drivers/input/tablet/pegasus_notetaker.c b/drivers/input/tablet/pegasus_notetaker.c
index 805afe36aa7b..78dbf39a6fc0 100644
--- a/drivers/input/tablet/pegasus_notetaker.c
+++ b/drivers/input/tablet/pegasus_notetaker.c
@@ -80,15 +80,16 @@ struct pegasus {
struct work_struct init;
};
-static void pegasus_control_msg(struct pegasus *pegasus, u8 *data, int len)
+static int pegasus_control_msg(struct pegasus *pegasus, u8 *data, int len)
{
const int sizeof_buf = len + 2;
int result;
+ int error;
u8 *cmd_buf;
cmd_buf = kmalloc(sizeof_buf, GFP_KERNEL);
if (!cmd_buf)
- return;
+ return -ENOMEM;
cmd_buf[0] = NOTETAKER_REPORT_ID;
cmd_buf[1] = len;
@@ -101,17 +102,23 @@ static void pegasus_control_msg(struct pegasus *pegasus, u8 *data, int len)
0, 0, cmd_buf, sizeof_buf,
USB_CTRL_SET_TIMEOUT);
- if (result != sizeof_buf)
- dev_err(&pegasus->usbdev->dev, "control msg error\n");
-
kfree(cmd_buf);
+
+ if (unlikely(result != sizeof_buf)) {
+ error = result < 0 ? result : -EIO;
+ dev_err(&pegasus->usbdev->dev, "control msg error: %d\n",
+ error);
+ return error;
+ }
+
+ return 0;
}
-static void pegasus_set_mode(struct pegasus *pegasus, u8 mode, u8 led)
+static int pegasus_set_mode(struct pegasus *pegasus, u8 mode, u8 led)
{
u8 cmd[] = { NOTETAKER_SET_CMD, NOTETAKER_SET_MODE, led, mode };
- pegasus_control_msg(pegasus, cmd, sizeof(cmd));
+ return pegasus_control_msg(pegasus, cmd, sizeof(cmd));
}
static void pegasus_parse_packet(struct pegasus *pegasus)
@@ -191,8 +198,12 @@ static void pegasus_irq(struct urb *urb)
static void pegasus_init(struct work_struct *work)
{
struct pegasus *pegasus = container_of(work, struct pegasus, init);
+ int error;
- pegasus_set_mode(pegasus, PEN_MODE_XY, NOTETAKER_LED_MOUSE);
+ error = pegasus_set_mode(pegasus, PEN_MODE_XY, NOTETAKER_LED_MOUSE);
+ if (error)
+ dev_err(&pegasus->usbdev->dev, "pegasus_set_mode error: %d\n",
+ error);
}
static int pegasus_open(struct input_dev *dev)
@@ -208,7 +219,7 @@ static int pegasus_open(struct input_dev *dev)
if (usb_submit_urb(pegasus->irq, GFP_KERNEL))
retval = -EIO;
- pegasus_set_mode(pegasus, PEN_MODE_XY, NOTETAKER_LED_MOUSE);
+ retval = pegasus_set_mode(pegasus, PEN_MODE_XY, NOTETAKER_LED_MOUSE);
usb_autopm_put_interface(pegasus->intf);