It was a bug that could cause oops if demodulator attach was
failed.
Signed-off-by: Antti Palosaari <crope@xxxxxx>
---
drivers/media/usb/em28xx/em28xx-dvb.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index e0128b3..be242ac 100644
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -1001,19 +1001,22 @@ static int em28xx_dvb_init(struct em28xx *dev)
result = -EINVAL;
goto out_free;
}
- }
#ifdef CONFIG_GPIOLIB
- /* enable LNA for DVB-T, DVB-T2 and DVB-C */
- result = gpio_request_one(dvb->gpio, GPIOF_OUT_INIT_LOW, NULL);
- if (result)
- em28xx_errdev("gpio request failed %d\n", result);
- else
- gpio_free(dvb->gpio);
-
- result = 0; /* continue even set LNA fails */
+ /* enable LNA for DVB-T, DVB-T2 and DVB-C */
+ result = gpio_request_one(dvb->gpio,
+ GPIOF_OUT_INIT_LOW, NULL);
+ if (result)
+ em28xx_errdev("gpio request failed %d\n",
+ result);
+ else
+ gpio_free(dvb->gpio);
+
+ result = 0; /* continue even set LNA fails */
#endif
- dvb->fe[0]->ops.set_lna = em28xx_pctv_290e_set_lna;
+ dvb->fe[0]->ops.set_lna = em28xx_pctv_290e_set_lna;
+ }
+
break;
case EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C:
{
--
1.7.11.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
