mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-06-02 01:42:20 -04:00
mmc: vub300: rename probe error labels
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>
This commit is contained in:
committed by
Ulf Hansson
parent
fe0179f325
commit
5b8b35d6f4
@@ -2107,19 +2107,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;
|
||||
@@ -2336,10 +2336,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);
|
||||
@@ -2347,12 +2348,13 @@ static int vub300_probe(struct usb_interface *interface,
|
||||
* 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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user