summaryrefslogtreecommitdiff
path: root/drivers/staging/cptm1217/clearpad_tm1217.c
diff options
context:
space:
mode:
authorDevendra Naga <devendra.aaru@gmail.com>2015-01-02 13:17:06 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-17 16:05:02 -0800
commit60c47c62f012b4f551132374e37e4f93a9596107 (patch)
tree11789a1b06b62fc7fe676636b949b62b2b50d316 /drivers/staging/cptm1217/clearpad_tm1217.c
parentd6b87b0a64879fd548e836bdc901ad20de99cd4b (diff)
cptm1217: check if interrupts are masked at probe
the function cp_tm1217_mask_interrupt can return failure. added the check and the failure path. Cc: Ramesh Agarwal <ramesh.agarwal@intel.com> Signed-off-by: Devendra Naga <devendra.aaru@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/cptm1217/clearpad_tm1217.c')
-rw-r--r--drivers/staging/cptm1217/clearpad_tm1217.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/staging/cptm1217/clearpad_tm1217.c b/drivers/staging/cptm1217/clearpad_tm1217.c
index 7f265ce0dd13..43046049830c 100644
--- a/drivers/staging/cptm1217/clearpad_tm1217.c
+++ b/drivers/staging/cptm1217/clearpad_tm1217.c
@@ -446,6 +446,12 @@ static int cp_tm1217_probe(struct i2c_client *client,
/* Mask all the interrupts */
retval = cp_tm1217_mask_interrupt(ts);
+ if (retval) {
+ dev_err(ts->dev, "failed to mask interrupts, error: %d\n",
+ retval);
+ kfree(ts);
+ return retval;
+ }
/* Read the controller information */
cp_tm1217_init_data(ts);