averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-09-22 09:34:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

mmc: vub300: rename probe error labels

Browse Source 
[ Upstream commit 5b8b35d6f4 ]

Error labels should be named after what they do.

Rename the probe error labels.

Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Stable-dep-of: a3b5f24299 ("mmc: vub300: fix use-after-free on probe failure")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold
2026-08-03 11:22:11 +02:00
committed by Greg Kroah-Hartman
parent 8ced1d242c
commit 73d397ab54
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/mmc/host/vub300.c
+10 -8
View File
@@ -2115,19 +2115,19 @@ static int vub300_probe(struct usb_interface *interface,
command_out_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!command_out_urb) {
retval = -ENOMEM;
goto error0;
goto err_put_udev;
}
command_res_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!command_res_urb) {
retval = -ENOMEM;
goto error1;
goto err_free_out_urb;
}
/* this also allocates memory for our VUB300 mmc host device */
mmc = mmc_alloc_host(sizeof(*vub300), &udev->dev);
if (!mmc) {
retval = -ENOMEM;
dev_err(&udev->dev, "not enough memory for the mmc_host\n");
goto error4;
goto err_free_res_urb;
}
/* MMC core transfer sizes tunable parameters */
mmc->caps = 0;
@@ -2344,10 +2344,11 @@ static int vub300_probe(struct usb_interface *interface,
interface_to_InterfaceNumber(interface));
retval = mmc_add_host(mmc);
if (retval)
goto error6;
goto err_delete_timer;
return 0;
error6:
err_delete_timer:
timer_delete_sync(&vub300->inactivity_timer);
err_free_host:
mmc_free_host(mmc);
@@ -2355,12 +2356,13 @@ err_free_host:
* and hence also frees vub300
* which is contained at the end of struct mmc
*/
error4:
err_free_res_urb:
usb_free_urb(command_res_urb);
error1:
err_free_out_urb:
usb_free_urb(command_out_urb);
error0:
err_put_udev:
usb_put_dev(udev);
return retval;
}