diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-21 23:28:35 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-21 23:28:35 -0700 |
| commit | 57b8628bb0ac4e47c806e45c5bbd89282e93869b (patch) | |
| tree | ee9289f0898054474b7e5054abdb3ffb78666436 /drivers/input/tablet | |
| parent | 486c8aba39e5f194519cd5c0e85e5d1de8b74b03 (diff) | |
| parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
Merge commit 'v3.4-rc4' into next
Diffstat (limited to 'drivers/input/tablet')
| -rw-r--r-- | drivers/input/tablet/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/input/tablet/wacom_sys.c | 2 | ||||
| -rw-r--r-- | drivers/input/tablet/wacom_wac.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/drivers/input/tablet/Kconfig b/drivers/input/tablet/Kconfig index 0edeb949109..bed7cbf84cf 100644 --- a/drivers/input/tablet/Kconfig +++ b/drivers/input/tablet/Kconfig @@ -78,6 +78,8 @@ config TABLET_USB_WACOM depends on USB_ARCH_HAS_HCD select POWER_SUPPLY select USB + select NEW_LEDS + select LEDS_CLASS help Say Y here if you want to use the USB version of the Wacom Intuos or Graphire tablet. Make sure to say Y to "Mouse support" diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index 1c874adb705..98e9dd692d6 100644 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c @@ -1052,6 +1052,8 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i return -EINVAL; wacom = kzalloc(sizeof(struct wacom), GFP_KERNEL); + if (!wacom) + return -ENOMEM; wacom_wac = &wacom->wacom_wac; wacom_wac->features = *((struct wacom_features *)id->driver_info); diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index a6173431d80..d96e186f71d 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -977,7 +977,7 @@ static int wacom_bpt3_touch(struct wacom_wac *wacom) { struct input_dev *input = wacom->input; unsigned char *data = wacom->data; - int count = data[1] & 0x03; + int count = data[1] & 0x07; int i; if (data[0] != 0x02) |