summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2012-08-02 19:31:53 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-12 05:42:57 -0300
commitb50b3e0732845563626c8e40f8b6eed92172cd10 (patch)
treeb69d0cce4b0a1354f4072e699615ad153537a277 /drivers/media/dvb/dvb-usb
parent397e972350c42cbaf3228fe2eec23fecf6a69903 (diff)
downloadop-kernel-dev-b50b3e0732845563626c8e40f8b6eed92172cd10.zip
op-kernel-dev-b50b3e0732845563626c8e40f8b6eed92172cd10.tar.gz
[media] dvb_usb_lmedm04: don't crash if firmware is not loaded
There is a missing error handling when no firmware file found. It seems that this is more of a problem with udev-182+. However, so far udev-182 is only a problem on first ever plug. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Tested-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb')
-rw-r--r--drivers/media/dvb/dvb-usb/lmedm04.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/dvb/dvb-usb/lmedm04.c
index 25d1031..26ba5bc 100644
--- a/drivers/media/dvb/dvb-usb/lmedm04.c
+++ b/drivers/media/dvb/dvb-usb/lmedm04.c
@@ -878,6 +878,10 @@ static int lme_firmware_switch(struct usb_device *udev, int cold)
fw_lme = fw_c_rs2000;
ret = request_firmware(&fw, fw_lme, &udev->dev);
dvb_usb_lme2510_firmware = TUNER_RS2000;
+ if (ret == 0)
+ break;
+ info("FRM No Firmware Found - please install");
+ cold_fw = 0;
break;
default:
fw_lme = fw_c_s7395;
OpenPOWER on IntegriCloud