From 360d915b727b19b826bc27ae9b0ee573db28b2c9 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 29 Mar 2012 22:38:11 -0700 Subject: [PATCH] --- yaml --- r: 297795 b: refs/heads/master c: f182394033d639679264d61e6dca62761e659ff7 h: refs/heads/master i: 297793: ec195a7fbb9802325a3588a7741452cfff08ae37 297791: 9d437c0357e462881f5948e7f633eaaad032b741 v: v3 --- [refs] | 2 +- trunk/drivers/input/tablet/wacom_sys.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ffb9004babcd..354b7bb0df99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 993808253ca256b8ca7f8ff90d9935d7c99cd32d +refs/heads/master: f182394033d639679264d61e6dca62761e659ff7 diff --git a/trunk/drivers/input/tablet/wacom_sys.c b/trunk/drivers/input/tablet/wacom_sys.c index 19ba58640dc2..0d269212931e 100644 --- a/trunk/drivers/input/tablet/wacom_sys.c +++ b/trunk/drivers/input/tablet/wacom_sys.c @@ -1002,6 +1002,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);