[PATCH v9 6/6] davinci: USB1.1 support for Omapl138-Hawkboard

Nori, Sekhar nsekhar at ti.com
Mon Dec 6 06:12:10 EST 2010


On Fri, Dec 03, 2010 at 22:40:44, Victor Rodriguez wrote:

>  arch/arm/mach-davinci/board-omapl138-hawk.c |   38 ++++++++++++++++++++------
>  1 files changed, 29 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c
> b/arch/arm/mach-davinci/board-omapl138-hawk.c
> index da51136..8fc78f2 100644
> --- a/arch/arm/mach-davinci/board-omapl138-hawk.c
> +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
> @@ -157,7 +157,7 @@ static __init void omapl138_hawk_mmc_init(void)
>       if (ret < 0) {
>               pr_warning("%s: can not open GPIO %d\n",
>                       __func__, DA850_HAWK_MMCSD_CD_PIN);
> -             return;
> +             goto exp_setup_cd_fail;
>       }
>
>       ret = gpio_request_one(DA850_HAWK_MMCSD_WP_PIN,
> @@ -165,13 +165,23 @@ static __init void omapl138_hawk_mmc_init(void)
>       if (ret < 0) {
>               pr_warning("%s: can not open GPIO %d\n",
>                       __func__, DA850_HAWK_MMCSD_WP_PIN);
> -             return;
> +             goto exp_setup_wp_fail;
>       }
>
>       ret = da8xx_register_mmcsd0(&da850_mmc_config);
> -     if (ret)
> +     if (ret) {
>               pr_warning("%s: MMC/SD0 registration failed: %d\n",
>                       __func__, ret);
> +             goto exp_setup_mmcsd_fail;
> +     }
> +             return;

This return has extra indentation.

> +
> +exp_setup_mmcsd_fail:
> +     gpio_free(DA850_HAWK_MMCSD_WP_PIN);
> +exp_setup_wp_fail:
> +     gpio_free(DA850_HAWK_MMCSD_CD_PIN);
> +exp_setup_cd_fail:
> +             return;

This one too. Other than that, it all looks good to me.

Thanks,
Sekhar




More information about the linux-arm-kernel mailing list