cptm1217: check if interrupts are masked at probe
authorDevendra Naga <devendra.aaru@gmail.com>
Fri, 2 Jan 2015 18:17:06 +0000 (13:17 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 18 Jan 2015 00:05:02 +0000 (16:05 -0800)
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>
drivers/staging/cptm1217/clearpad_tm1217.c

index 7f265ce0dd13de32dfc8813c7d4855b117310845..43046049830c3135e07b8cf4f4e923e4717f7479 100644 (file)
@@ -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);