34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From: Dan Carpenter <dan.carpenter@oracle.com>
|
|
Date: Thu, 29 Mar 2012 22:38:11 -0700
|
|
Subject: Input: wacom - check for allocation failure in probe()
|
|
|
|
commit f182394033d639679264d61e6dca62761e659ff7 upstream.
|
|
|
|
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>
|
|
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
|
|
---
|
|
drivers/input/tablet/wacom_sys.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
|
|
index 59a42e23ddfa..bf2462132c5c 100644
|
|
--- a/drivers/input/tablet/wacom_sys.c
|
|
+++ b/drivers/input/tablet/wacom_sys.c
|
|
@@ -866,6 +866,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);
|
|
--
|
|
1.7.10.1
|
|
|