From d62349f9c0840788a4842537a0a0a4643c4ce825 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 19 Mar 2013 12:00:23 -0300
Subject: [PATCH] --- yaml --- r: 366623 b: refs/heads/master c:
 e584f9d61ea0aefa81ddd3faf53100536ba4057e h: refs/heads/master i:   366621:
 6b9ff5352c8af17f8889130161615fab9ecab5f1   366619:
 3004880fa430c8955472c695e050fd3a6d660163   366615:
 5c98352e43d17d5e12cf3913ff3c983e7b6d8395   366607:
 ee338ea4e8eae6d5b171c7ee6e826412a9e9ae35   366591:
 93d68ee0c06c8246a6206caacffde8e4f1d19ca9 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/media/common/siano/smscoreapi.c | 33 +++----------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/[refs] b/[refs]
index d09002bbd99f..2a7a6effecb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9711a8a600a12d2895c18f31be1fc5b3c4d9b209
+refs/heads/master: e584f9d61ea0aefa81ddd3faf53100536ba4057e
diff --git a/trunk/drivers/media/common/siano/smscoreapi.c b/trunk/drivers/media/common/siano/smscoreapi.c
index 44040a60cd77..d57df9170ae1 100644
--- a/trunk/drivers/media/common/siano/smscoreapi.c
+++ b/trunk/drivers/media/common/siano/smscoreapi.c
@@ -1048,7 +1048,7 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev,
 
 
 static char *smscore_get_fw_filename(struct smscore_device_t *coredev,
-			      int mode, int lookup);
+				     int mode);
 
 /**
  * loads specified firmware into a buffer and calls device loadfirmware_handler
@@ -1061,7 +1061,7 @@ static char *smscore_get_fw_filename(struct smscore_device_t *coredev,
  * @return 0 on success, <0 on error.
  */
 static int smscore_load_firmware_from_file(struct smscore_device_t *coredev,
-					   int mode, int lookup,
+					   int mode,
 					   loadfirmware_t loadfirmware_handler)
 {
 	int rc = -ENOENT;
@@ -1069,7 +1069,7 @@ static int smscore_load_firmware_from_file(struct smscore_device_t *coredev,
 	u32 fw_buf_size;
 	const struct firmware *fw;
 
-	char *fw_filename = smscore_get_fw_filename(coredev, mode, lookup);
+	char *fw_filename = smscore_get_fw_filename(coredev, mode);
 	if (!fw_filename) {
 		sms_info("mode %d not supported on this device", mode);
 		return -ENOENT;
@@ -1268,7 +1268,7 @@ static char *smscore_fw_lkup[][DEVICE_MODE_MAX] = {
  * @return 0 on success, <0 on error.
  */
 static char *smscore_get_fw_filename(struct smscore_device_t *coredev,
-			      int mode, int lookup)
+			      int mode)
 {
 	char **fw;
 	int board_id = smscore_get_board_id(coredev);
@@ -1282,12 +1282,6 @@ static char *smscore_get_fw_filename(struct smscore_device_t *coredev,
 	if (mode <= DEVICE_MODE_NONE || mode >= DEVICE_MODE_MAX)
 		return NULL;
 
-	if ((board_id == SMS_BOARD_UNKNOWN) || (lookup == 1)) {
-		sms_debug("trying to get fw name from lookup table mode %d type %d",
-			  mode, type);
-		return smscore_fw_lkup[type][mode];
-	}
-
 	sms_debug("trying to get fw name from sms_boards board_id %d mode %d",
 		  board_id, mode);
 	fw = sms_get_board(board_id)->fw;
@@ -1373,24 +1367,7 @@ int smscore_set_device_mode(struct smscore_device_t *coredev, int mode)
 
 		if (!(coredev->modes_supported & (1 << mode))) {
 			rc = smscore_load_firmware_from_file(coredev,
-							     mode, 0, NULL);
-
-			/*
-			* try again with the default firmware -
-			* get the fw filename from look-up table
-			*/
-			if (rc < 0) {
-				sms_debug("error %d loading firmware, trying again with default firmware",
-					  rc);
-				rc = smscore_load_firmware_from_file(coredev,
-								     mode, 1,
-								     NULL);
-				if (rc < 0) {
-					sms_debug("error %d loading firmware",
-						  rc);
-					return rc;
-				}
-			}
+							     mode, NULL);
 			if (rc >= 0)
 				sms_info("firmware download success");
 		} else {