Skip to content

Commit

Permalink
[media] em28xx: do not set PCTV 290e LNA handler if fe attach fail
Browse files Browse the repository at this point in the history
It was a bug that could cause oops if demodulator attach was
failed.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Oct 1, 2012
1 parent a36a66d commit 0c42a55
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions drivers/media/usb/em28xx/em28xx-dvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1002,20 +1002,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->lna_gpio, GPIOF_OUT_INIT_LOW,
NULL);
if (result)
em28xx_errdev("gpio request failed %d\n", result);
else
gpio_free(dvb->lna_gpio);

result = 0; /* continue even set LNA fails */
/* enable LNA for DVB-T, DVB-T2 and DVB-C */
result = gpio_request_one(dvb->lna_gpio,
GPIOF_OUT_INIT_LOW, NULL);
if (result)
em28xx_errdev("gpio request failed %d\n",
result);
else
gpio_free(dvb->lna_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:
{
Expand Down

0 comments on commit 0c42a55

Please sign in to comment.