aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-03-30 01:38:11 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-30 01:42:19 -0400
commitf182394033d639679264d61e6dca62761e659ff7 (patch)
treee47443baa512862a135e020572c123dd07eacd95
parent993808253ca256b8ca7f8ff90d9935d7c99cd32d (diff)
Input: wacom - check for allocation failure in probe()
We accidentally removed the check for NULL in 3aac0ef10b "Input: wacom - isolate input registration". Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Chris Bagwell <chris@cnpbagwell.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r--drivers/input/tablet/wacom_sys.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 19ba58640dc2..0d269212931e 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -1002,6 +1002,8 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
1002 return -EINVAL; 1002 return -EINVAL;
1003 1003
1004 wacom = kzalloc(sizeof(struct wacom), GFP_KERNEL); 1004 wacom = kzalloc(sizeof(struct wacom), GFP_KERNEL);
1005 if (!wacom)
1006 return -ENOMEM;
1005 1007
1006 wacom_wac = &wacom->wacom_wac; 1008 wacom_wac = &wacom->wacom_wac;
1007 wacom_wac->features = *((struct wacom_features *)id->driver_info); 1009 wacom_wac->features = *((struct wacom_features *)id->driver_info);