commit cc62b1cce23459f8074f71567e9fe0f1e64c991b
author Srinivasa Rao Uppala <uppalas@codeaurora.org> Mon Aug 22 19:15:29 2011 +0530
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:16:16 2011 -0700
tree 27612f8303f84f2c4d5fa7aac485b5d7a4e94da9
parent b7f53dc2dac84df9754f46bb1249e4aed3ff46d5

radio:iris:Fix for regional band settings issue

This patch fixes the bug where the regional band settings were
overwritten by default settings.
And also sets proper high and low band limits
for Japan band.

Signed-off-by: Srinivasa Rao Uppala <uppalas@codeaurora.org>

drivers/media/radio/radio-iris.c

diff --git a/drivers/media/radio/radio-iris.c b/drivers/media/radio/radio-iris.c
index 07b34ee..ab80613 100644
--- a/drivers/media/radio/radio-iris.c
+++ b/drivers/media/radio/radio-iris.c
@@ -1964,9 +1964,9 @@
 		break;
 	case IRIS_REGION_JAPAN:
 		radio->recv_conf.band_low_limit =
-			REGION_JAPAN_STANDARD_BAND_HIGH;
-		radio->recv_conf.band_high_limit =
 			REGION_JAPAN_STANDARD_BAND_LOW;
+		radio->recv_conf.band_high_limit =
+			REGION_JAPAN_STANDARD_BAND_HIGH;
 		break;
 	case IRIS_REGION_JAPAN_WIDE:
 		radio->recv_conf.band_low_limit =
@@ -2008,9 +2008,9 @@
 		break;
 	case IRIS_REGION_JAPAN:
 		radio->trans_conf.band_low_limit =
-			REGION_JAPAN_STANDARD_BAND_HIGH;
-		radio->trans_conf.band_high_limit =
 			REGION_JAPAN_STANDARD_BAND_LOW;
+		radio->trans_conf.band_high_limit =
+			REGION_JAPAN_STANDARD_BAND_HIGH;
 		break;
 	case IRIS_REGION_JAPAN_WIDE:
 		radio->recv_conf.band_low_limit =
@@ -2236,13 +2236,6 @@
 	unsigned int rds_grps_proc = 0;
 	__u8 temp_val = 0;
 	unsigned long arg = 0;
-	radio->recv_conf.emphasis = 0;
-	radio->recv_conf.ch_spacing = 0;
-	radio->recv_conf.hlsi = 0;
-	radio->recv_conf.band_low_limit = 87500;
-	radio->recv_conf.band_high_limit = 108000;
-	radio->recv_conf.rds_std = 0;
-
 
 	switch (ctrl->id) {
 	case VL2_CID_PRIVATE_IRIS_TX_TONE:
@@ -2273,6 +2266,14 @@
 		iris_search(radio, ctrl->value, SRCH_DIR_UP);
 		break;
 	case V4L2_CID_PRIVATE_IRIS_STATE:
+		radio->recv_conf.emphasis = 0;
+		radio->recv_conf.ch_spacing = 0;
+		radio->recv_conf.hlsi = 0;
+		radio->recv_conf.band_low_limit =
+			REGION_US_EU_BAND_LOW;
+		radio->recv_conf.band_high_limit =
+			REGION_US_EU_BAND_HIGH;
+		radio->recv_conf.rds_std = 0;
 		switch (ctrl->value) {
 		case FM_RECV:
 			retval = hci_cmd(HCI_FM_ENABLE_RECV_CMD,
@@ -2328,6 +2329,7 @@
 			default:
 				retval = -EINVAL;
 			}
+			break;
 		default:
 			retval = -EINVAL;
 		}