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;