Re: [PATCH] media: em28xx - add error handling for KWORLD dvb_attach failures

[Antti Palosaari]

Looks correct!
All the other devices, excluding those few PCTV ones I have added, has 
that same bug... Deadlocks if tuner attach fails.

Reviewed-by: Antti Palosaari <crope@xxxxxx>

regards
Antti


On 07/09/2014 11:36 PM, Shuah Khan wrote:
> Add error hanlding when EM2870_BOARD_KWORLD_A340 dvb_attach()
> for fe and tuner fail in em28xx_dvb_init().
>
> Signed-off-by: Shuah Khan <shuah.kh@xxxxxxxxxxx>
> ---
>   drivers/media/usb/em28xx/em28xx-dvb.c |   14 +++++++++++---
>   1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
> index d381861..8314f51 100644
> --- a/drivers/media/usb/em28xx/em28xx-dvb.c
> +++ b/drivers/media/usb/em28xx/em28xx-dvb.c
> @@ -1213,9 +1213,17 @@ static int em28xx_dvb_init(struct em28xx *dev)
>   		dvb->fe[0] = dvb_attach(lgdt3305_attach,
>   					   &em2870_lgdt3304_dev,
>   					   &dev->i2c_adap[dev->def_i2c_bus]);
> -		if (dvb->fe[0] != NULL)
> -			dvb_attach(tda18271_attach, dvb->fe[0], 0x60,
> -				   &dev->i2c_adap[dev->def_i2c_bus], &kworld_a340_config);
> +		if (!dvb->fe[0]) {
> +			result = -EINVAL;
> +			goto out_free;
> +		}
> +		if (!dvb_attach(tda18271_attach, dvb->fe[0], 0x60,
> +			&dev->i2c_adap[dev->def_i2c_bus],
> +			&kworld_a340_config)) {
> +				dvb_frontend_detach(dvb->fe[0]);
> +				result = -EINVAL;
> +				goto out_free;
> +		}
>   		break;
>   	case EM28174_BOARD_PCTV_290E:
>   		/* set default GPIO0 for LNA, used if GPIOLIB is undefined */

--
http://palosaari.fi/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/