diff options
author | Malcolm Priestley <tvboxspy@gmail.com> | 2012-08-02 18:31:53 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-12 04:42:57 -0400 |
commit | b50b3e0732845563626c8e40f8b6eed92172cd10 (patch) | |
tree | b69d0cce4b0a1354f4072e699615ad153537a277 | |
parent | 397e972350c42cbaf3228fe2eec23fecf6a69903 (diff) |
[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>
-rw-r--r-- | drivers/media/dvb/dvb-usb/lmedm04.c | 4 |
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 25d1031460f8..26ba5bc92c61 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) | |||
878 | fw_lme = fw_c_rs2000; | 878 | fw_lme = fw_c_rs2000; |
879 | ret = request_firmware(&fw, fw_lme, &udev->dev); | 879 | ret = request_firmware(&fw, fw_lme, &udev->dev); |
880 | dvb_usb_lme2510_firmware = TUNER_RS2000; | 880 | dvb_usb_lme2510_firmware = TUNER_RS2000; |
881 | if (ret == 0) | ||
882 | break; | ||
883 | info("FRM No Firmware Found - please install"); | ||
884 | cold_fw = 0; | ||
881 | break; | 885 | break; |
882 | default: | 886 | default: |
883 | fw_lme = fw_c_s7395; | 887 | fw_lme = fw_c_s7395; |