From 4074d2ccd6fb4f121ace3cca82b376836036ad95 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Mon, 1 Apr 2013 01:09:15 -0700
Subject: [PATCH] --- yaml --- r: 368091 b: refs/heads/master c:
 3c2b901003b4c152e19e6578c1705ce2c90edd4a h: refs/heads/master i:   368089:
 5fb5e9293b1befed40b05efb2c21ac8a3eea4c11   368087:
 8da98e193d937ff3714ba8204d31a007e2e696d7 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/input/misc/ims-pcu.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a16dbefebb08..6aef4ab0650f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3903078677a8dc6f056970b67d15840aa51e1dfa
+refs/heads/master: 3c2b901003b4c152e19e6578c1705ce2c90edd4a
diff --git a/trunk/drivers/input/misc/ims-pcu.c b/trunk/drivers/input/misc/ims-pcu.c
index 1b044b99da66..e204f26b0011 100644
--- a/trunk/drivers/input/misc/ims-pcu.c
+++ b/trunk/drivers/input/misc/ims-pcu.c
@@ -292,7 +292,8 @@ static int ims_pcu_setup_gamepad(struct ims_pcu *pcu)
 	if (!gamepad || !input) {
 		dev_err(pcu->dev,
 			"Not enough memory for gamepad device\n");
-		return -ENOMEM;
+		error = -ENOMEM;
+		goto err_free_mem;
 	}
 
 	gamepad->input = input;
@@ -1156,7 +1157,7 @@ static ssize_t ims_pcu_update_firmware_store(struct device *dev,
 {
 	struct usb_interface *intf = to_usb_interface(dev);
 	struct ims_pcu *pcu = usb_get_intfdata(intf);
-	const struct firmware *fw;
+	const struct firmware *fw = NULL;
 	int value;
 	int error;