summaryrefslogtreecommitdiffstats
path: root/drivers/usb/misc
diff options
context:
space:
mode:
authorLucas Tanure <tanure@linux.com>2020-11-15 11:28:37 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-11-18 12:53:45 +0100
commitb0eec52fbe63fd8c3cffb8ef8d442c6fafb909b0 (patch)
tree0c1b4fa9b509eecb166ca3bd5cae140d5e897379 /drivers/usb/misc
parentusb/max3421: fix return error code in max3421_probe() (diff)
downloadlinux-b0eec52fbe63fd8c3cffb8ef8d442c6fafb909b0.tar.xz
linux-b0eec52fbe63fd8c3cffb8ef8d442c6fafb909b0.zip
USB: apple-mfi-fastcharge: Fix kfree after failed kzalloc
kfree don't need to be called after a failed kzalloc Signed-off-by: Lucas Tanure <tanure@linux.com> Link: https://lore.kernel.org/r/20201115102837.331335-1-tanure@linux.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/misc')
-rw-r--r--drivers/usb/misc/apple-mfi-fastcharge.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/usb/misc/apple-mfi-fastcharge.c b/drivers/usb/misc/apple-mfi-fastcharge.c
index 9de0171b5177..6dedd5498e8a 100644
--- a/drivers/usb/misc/apple-mfi-fastcharge.c
+++ b/drivers/usb/misc/apple-mfi-fastcharge.c
@@ -178,16 +178,13 @@ static int mfi_fc_probe(struct usb_device *udev)
{
struct power_supply_config battery_cfg = {};
struct mfi_device *mfi = NULL;
- int err;
if (!mfi_fc_match(udev))
return -ENODEV;
mfi = kzalloc(sizeof(struct mfi_device), GFP_KERNEL);
- if (!mfi) {
- err = -ENOMEM;
- goto error;
- }
+ if (!mfi)
+ return -ENOMEM;
battery_cfg.drv_data = mfi;
@@ -197,18 +194,14 @@ static int mfi_fc_probe(struct usb_device *udev)
&battery_cfg);
if (IS_ERR(mfi->battery)) {
dev_err(&udev->dev, "Can't register battery\n");
- err = PTR_ERR(mfi->battery);
- goto error;
+ kfree(mfi);
+ return PTR_ERR(mfi->battery);
}
mfi->udev = usb_get_dev(udev);
dev_set_drvdata(&udev->dev, mfi);
return 0;
-
-error:
- kfree(mfi);
- return err;
}
static void mfi_fc_disconnect(struct usb_device *udev)