From: Mauro Carvalho Chehab <m.chehab@samsung.com>
Date: Thu, 12 Sep 2013 20:04:07 +0000 (-0300)
Subject: [media] siano: Use the default firmware for Stellar
X-Git-Tag: android-x86-4.4-r2~811^2~1271
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b00ade2bb1f9ac6b25c6c8ac48ed82a1c43c5801;p=android-x86%2Fkernel.git

[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>
---

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;