summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/siano
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2013-09-12 22:04:07 +0200
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-10-14 11:41:10 +0200
commitb00ade2bb1f9ac6b25c6c8ac48ed82a1c43c5801 (patch)
treea42f93d114ee23a1e1b3f60827979aa1b9f34412 /drivers/media/usb/siano
parent[media] siano: Fix initialization for Stellar models (diff)
downloadlinux-b00ade2bb1f9ac6b25c6c8ac48ed82a1c43c5801.tar.xz
linux-b00ade2bb1f9ac6b25c6c8ac48ed82a1c43c5801.zip
[media] siano: Use the default firmware for Stellar
The Stellar firmware load routine is different. Improve it to use the default firmware, if no modprobe parameter tells otherwise. Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> Tested-by: André Roth <neolynx@gmail.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/usb/siano')
-rw-r--r--drivers/media/usb/siano/smsusb.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c
index 33f357510194..05bd91a60c09 100644
--- a/drivers/media/usb/siano/smsusb.c
+++ b/drivers/media/usb/siano/smsusb.c
@@ -245,6 +245,9 @@ static int smsusb1_load_firmware(struct usb_device *udev, int id, int board_id)
int rc, dummy;
char *fw_filename;
+ if (id < 0)
+ id = sms_get_board(board_id)->default_mode;
+
if (id < DEVICE_MODE_DVBT || id > DEVICE_MODE_DVBT_BDA) {
sms_err("invalid firmware id specified %d", id);
return -EINVAL;