diff --git a/[refs] b/[refs]
index aacb5860ccf0..e09dac8c9d30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62af33ec6e73d658720ea1190861c8c0609a94b3
+refs/heads/master: a1a26e492c4a90466cb3e064ccf69db4dd66d63a
diff --git a/trunk/drivers/staging/cptm1217/clearpad_tm1217.c b/trunk/drivers/staging/cptm1217/clearpad_tm1217.c
index 269503f9516f..76e4b782d2fb 100644
--- a/trunk/drivers/staging/cptm1217/clearpad_tm1217.c
+++ b/trunk/drivers/staging/cptm1217/clearpad_tm1217.c
@@ -460,9 +460,9 @@ static int cp_tm1217_probe(struct i2c_client *client,
 	for (i = 0; i < TOUCH_SUPPORTED; i++) {
 		input_dev = input_allocate_device();
 		if (input_dev == NULL) {
-			kfree(ts);
 			dev_err(ts->dev,
 				"cp_tm1217:Input Device Struct alloc failed\n");
+			kfree(ts);
 			return -ENOMEM;
 		}
 		input_info = &ts->cp_input_info[i];