V4L/DVB (6866): msp3400: CodingStyle cleanups (d52c7385) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/media/video/msp3400-driver.c

+97 −70

Original line number	Diff line number	Diff line
		@@ -42,7 +42,8 @@
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
		* 02110-1301, USA.
		*/


		@@ -72,7 +73,8 @@ int msp_debug; /* msp_debug output */
		int msp_once; /* no continous stereo monitoring */
		int msp_amsound; /* hard-wire AM sound at 6.5 Hz (france),
		the autoscan seems work well only with FM... */
		int msp_standard = 1; /* Override auto detect of audio msp_standard, if needed. */
		int msp_standard = 1; /* Override auto detect of audio msp_standard,
		if needed. */
		int msp_dolby;

		int msp_stereo_thresh = 0x190; /* a2 threshold for stereo/bilingual
		@@ -161,12 +163,13 @@ static int msp_read(struct i2c_client *client, int dev, int addr)
		schedule_timeout_interruptible(msecs_to_jiffies(10));
		}
		if (err == 3) {
		v4l_warn(client, "giving up, resetting chip. Sound will go off, sorry folks :-\|\n");
		v4l_warn(client, "resetting chip, sound will go off.\n");
		msp_reset(client);
		return -1;
		}
		retval = read[0] << 8 \| read[1];
		v4l_dbg(3, msp_debug, client, "msp_read(0x%x, 0x%x): 0x%x\n", dev, addr, retval);
		v4l_dbg(3, msp_debug, client, "msp_read(0x%x, 0x%x): 0x%x\n",
		dev, addr, retval);
		return retval;
		}

		@@ -191,7 +194,8 @@ static int msp_write(struct i2c_client *client, int dev, int addr, int val)
		buffer[3] = val >> 8;
		buffer[4] = val & 0xff;

		v4l_dbg(3, msp_debug, client, "msp_write(0x%x, 0x%x, 0x%x)\n", dev, addr, val);
		v4l_dbg(3, msp_debug, client, "msp_write(0x%x, 0x%x, 0x%x)\n",
		dev, addr, val);
		for (err = 0; err < 3; err++) {
		if (i2c_master_send(client, buffer, 5) == 5)
		break;
		@@ -200,7 +204,7 @@ static int msp_write(struct i2c_client *client, int dev, int addr, int val)
		schedule_timeout_interruptible(msecs_to_jiffies(10));
		}
		if (err == 3) {
		v4l_warn(client, "giving up, resetting chip. Sound will go off, sorry folks :-\|\n");
		v4l_warn(client, "resetting chip, sound will go off.\n");
		msp_reset(client);
		return -1;
		}
		@@ -293,7 +297,8 @@ void msp_set_audio(struct i2c_client *client)
		val = (state->volume * 0x7f / 65535) << 8;

		v4l_dbg(1, msp_debug, client, "mute=%s scanning=%s volume=%d\n",
		state->muted ? "on" : "off", state->scan_in_progress ? "yes" : "no",
		state->muted ? "on" : "off",
		state->scan_in_progress ? "yes" : "no",
		state->volume);

		msp_write_dsp(client, 0x0000, val);
		@@ -736,13 +741,14 @@ static int msp_command(struct i2c_client client, unsigned int cmd, void arg)
		state->volume, state->muted ? " (muted)" : "");
		if (state->has_sound_processing) {
		v4l_info(client, "Audio: balance %d bass %d treble %d loudness %s\n",
		state->balance, state->bass, state->treble,
		state->balance, state->bass,
		state->treble,
		state->loudness ? "on" : "off");
		}
		switch (state->mode) {
		case MSP_MODE_AM_DETECT: p = "AM (for carrier detect)"; break;
		case MSP_MODE_FM_RADIO: p = "FM Radio"; break;
		case MSP_MODE_FM_TERRA: p = "Terrestial FM-mono + FM-stereo"; break;
		case MSP_MODE_FM_TERRA: p = "Terrestial FM-mono/stereo"; break;
		case MSP_MODE_FM_SAT: p = "Satellite FM-mono"; break;
		case MSP_MODE_FM_NICAM1: p = "NICAM/FM (B/G, D/K)"; break;
		case MSP_MODE_FM_NICAM2: p = "NICAM/FM (I)"; break;
		@@ -773,7 +779,8 @@ static int msp_command(struct i2c_client client, unsigned int cmd, void arg)
		}

		case VIDIOC_G_CHIP_IDENT:
		return v4l2_chip_ident_i2c_client(client, arg, state->ident, (state->rev1 << 16) \| state->rev2);
		return v4l2_chip_ident_i2c_client(client, arg, state->ident,
		(state->rev1 << 16) \| state->rev2);

		default:
		/* unknown */
		@@ -816,9 +823,8 @@ static int msp_probe(struct i2c_client *client)
		}

		state = kzalloc(sizeof(*state), GFP_KERNEL);
		if (!state) {
		if (!state)
		return -ENOMEM;
		}

		i2c_set_clientdata(client, state);

		@@ -840,9 +846,11 @@ static int msp_probe(struct i2c_client *client)
		state->rev1 = msp_read_dsp(client, 0x1e);
		if (state->rev1 != -1)
		state->rev2 = msp_read_dsp(client, 0x1f);
		v4l_dbg(1, msp_debug, client, "rev1=0x%04x, rev2=0x%04x\n", state->rev1, state->rev2);
		v4l_dbg(1, msp_debug, client, "rev1=0x%04x, rev2=0x%04x\n",
		state->rev1, state->rev2);
		if (state->rev1 == -1 \|\| (state->rev1 == 0 && state->rev2 == 0)) {
		v4l_dbg(1, msp_debug, client, "not an msp3400 (cannot read chip version)\n");
		v4l_dbg(1, msp_debug, client,
		"not an msp3400 (cannot read chip version)\n");
		kfree(state);
		return -ENODEV;
		}
		@@ -860,37 +868,55 @@ static int msp_probe(struct i2c_client *client)
		msp_family, msp_product,
		msp_revision, msp_hard, msp_rom);
		/* Rev B=2, C=3, D=4, G=7 */
		state->ident = msp_family * 10000 + 4000 + msp_product * 10 + msp_revision - '@';
		state->ident = msp_family * 10000 + 4000 + msp_product * 10 +
		msp_revision - '@';

		/* Has NICAM support: all mspx41x and mspx45x products have NICAM */
		state->has_nicam = msp_prod_hi == 1 \|\| msp_prod_hi == 5;
		state->has_nicam =
		msp_prod_hi == 1 \|\| msp_prod_hi == 5;
		/* Has radio support: was added with revision G */
		state->has_radio = msp_revision >= 'G';
		state->has_radio =
		msp_revision >= 'G';
		/* Has headphones output: not for stripped down products */
		state->has_headphones = msp_prod_lo < 5;
		state->has_headphones =
		msp_prod_lo < 5;
		/* Has scart2 input: not in stripped down products of the '3' family */
		state->has_scart2 = msp_family >= 4 \|\| msp_prod_lo < 7;
		state->has_scart2 =
		msp_family >= 4 \|\| msp_prod_lo < 7;
		/* Has scart3 input: not in stripped down products of the '3' family */
		state->has_scart3 = msp_family >= 4 \|\| msp_prod_lo < 5;
		state->has_scart3 =
		msp_family >= 4 \|\| msp_prod_lo < 5;
		/* Has scart4 input: not in pre D revisions, not in stripped D revs */
		state->has_scart4 = msp_family >= 4 \|\| (msp_revision >= 'D' && msp_prod_lo < 5);
		/* Has scart2 output: not in stripped down products of the '3' family */
		state->has_scart2_out = msp_family >= 4 \|\| msp_prod_lo < 5;
		state->has_scart4 =
		msp_family >= 4 \|\| (msp_revision >= 'D' && msp_prod_lo < 5);
		/* Has scart2 output: not in stripped down products of
		* the '3' family */
		state->has_scart2_out =
		msp_family >= 4 \|\| msp_prod_lo < 5;
		/* Has scart2 a volume control? Not in pre-D revisions. */
		state->has_scart2_out_volume = msp_revision > 'C' && state->has_scart2_out;
		state->has_scart2_out_volume =
		msp_revision > 'C' && state->has_scart2_out;
		/* Has a configurable i2s out? */
		state->has_i2s_conf = msp_revision >= 'G' && msp_prod_lo < 7;
		/* Has subwoofer output: not in pre-D revs and not in stripped down products */
		state->has_subwoofer = msp_revision >= 'D' && msp_prod_lo < 5;
		/* Has soundprocessing (bass/treble/balance/loudness/equalizer): not in
		stripped down products */
		state->has_sound_processing = msp_prod_lo < 7;
		state->has_i2s_conf =
		msp_revision >= 'G' && msp_prod_lo < 7;
		/* Has subwoofer output: not in pre-D revs and not in stripped down
		* products */
		state->has_subwoofer =
		msp_revision >= 'D' && msp_prod_lo < 5;
		/* Has soundprocessing (bass/treble/balance/loudness/equalizer):
		* not in stripped down products */
		state->has_sound_processing =
		msp_prod_lo < 7;
		/* Has Virtual Dolby Surround: only in msp34x1 */
		state->has_virtual_dolby_surround = msp_revision == 'G' && msp_prod_lo == 1;
		state->has_virtual_dolby_surround =
		msp_revision == 'G' && msp_prod_lo == 1;
		/* Has Virtual Dolby Surround & Dolby Pro Logic: only in msp34x2 */
		state->has_dolby_pro_logic = msp_revision == 'G' && msp_prod_lo == 2;
		/* The msp343xG supports BTSC only and cannot do Automatic Standard Detection. */
		state->force_btsc = msp_family == 3 && msp_revision == 'G' && msp_prod_hi == 3;
		state->has_dolby_pro_logic =
		msp_revision == 'G' && msp_prod_lo == 2;
		/* The msp343xG supports BTSC only and cannot do Automatic Standard
		* Detection. */
		state->force_btsc =
		msp_family == 3 && msp_revision == 'G' && msp_prod_hi == 3;

		state->opmode = opmode;
		if (state->opmode == OPMODE_AUTO) {
		@@ -905,32 +931,33 @@ static int msp_probe(struct i2c_client *client)
		}

		/* hello world :-) */
		v4l_info(client, "%s found @ 0x%x (%s)\n", client->name, client->addr << 1, client->adapter->name);
		v4l_info(client, "%s found @ 0x%x (%s)\n", client->name,
		client->addr << 1, client->adapter->name);
		v4l_info(client, "%s ", client->name);
		if (state->has_nicam && state->has_radio)
		printk("supports nicam and radio, ");
		printk(KERN_CONT "supports nicam and radio, ");
		else if (state->has_nicam)
		printk("supports nicam, ");
		printk(KERN_CONT "supports nicam, ");
		else if (state->has_radio)
		printk("supports radio, ");
		printk("mode is ");
		printk(KERN_CONT "supports radio, ");
		printk(KERN_CONT "mode is ");

		/* version-specific initialization */
		switch (state->opmode) {
		case OPMODE_MANUAL:
		printk("manual");
		printk(KERN_CONT "manual");
		thread_func = msp3400c_thread;
		break;
		case OPMODE_AUTODETECT:
		printk("autodetect");
		printk(KERN_CONT "autodetect");
		thread_func = msp3410d_thread;
		break;
		case OPMODE_AUTOSELECT:
		printk("autodetect and autoselect");
		printk(KERN_CONT "autodetect and autoselect");
		thread_func = msp34xxg_thread;
		break;
		}
		printk("\n");
		printk(KERN_CONT "\n");

		/* startup control thread if needed */
		if (thread_func) {

drivers/media/video/msp3400-kthreads.c

+98 −68

Original line number	Diff line number	Diff line
		@@ -15,7 +15,8 @@
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
		* 02110-1301, USA.
		*/


		@@ -224,7 +225,9 @@ void msp3400c_set_mode(struct i2c_client *client, int mode)
		nor do they support stereo BTSC. */
		static void msp3400c_set_audmode(struct i2c_client *client)
		{
		static char *strmode[] = { "mono", "stereo", "lang2", "lang1", "lang1+lang2" };
		static char *strmode[] = {
		"mono", "stereo", "lang2", "lang1", "lang1+lang2"
		};
		struct msp_state *state = i2c_get_clientdata(client);
		char *modestr = (state->audmode >= 0 && state->audmode < 5) ?
		strmode[state->audmode] : "unknown";
		@@ -298,19 +301,23 @@ static void msp3400c_set_audmode(struct i2c_client *client)
		case MSP_MODE_FM_NICAM1:
		case MSP_MODE_FM_NICAM2:
		case MSP_MODE_AM_NICAM:
		v4l_dbg(1, msp_debug, client, "NICAM set_audmode: %s\n",modestr);
		v4l_dbg(1, msp_debug, client,
		"NICAM set_audmode: %s\n", modestr);
		if (state->nicam_on)
		src = 0x0100; /* NICAM */
		break;
		case MSP_MODE_BTSC:
		v4l_dbg(1, msp_debug, client, "BTSC set_audmode: %s\n",modestr);
		v4l_dbg(1, msp_debug, client,
		"BTSC set_audmode: %s\n", modestr);
		break;
		case MSP_MODE_EXTERN:
		v4l_dbg(1, msp_debug, client, "extern set_audmode: %s\n",modestr);
		v4l_dbg(1, msp_debug, client,
		"extern set_audmode: %s\n", modestr);
		src = 0x0200; /* SCART */
		break;
		case MSP_MODE_FM_RADIO:
		v4l_dbg(1, msp_debug, client, "FM-Radio set_audmode: %s\n",modestr);
		v4l_dbg(1, msp_debug, client,
		"FM-Radio set_audmode: %s\n", modestr);
		break;
		default:
		v4l_dbg(1, msp_debug, client, "mono set_audmode\n");
		@@ -342,7 +349,8 @@ static void msp3400c_set_audmode(struct i2c_client *client)
		src \|= 0x0010;
		break;
		}
		v4l_dbg(1, msp_debug, client, "set_audmode final source/matrix = 0x%x\n", src);
		v4l_dbg(1, msp_debug, client,
		"set_audmode final source/matrix = 0x%x\n", src);

		msp_set_source(client, src);
		}
		@@ -351,21 +359,25 @@ static void msp3400c_print_mode(struct i2c_client *client)
		{
		struct msp_state *state = i2c_get_clientdata(client);

		if (state->main == state->second) {
		v4l_dbg(1, msp_debug, client, "mono sound carrier: %d.%03d MHz\n",
		if (state->main == state->second)
		v4l_dbg(1, msp_debug, client,
		"mono sound carrier: %d.%03d MHz\n",
		state->main / 910000, (state->main / 910) % 1000);
		} else {
		v4l_dbg(1, msp_debug, client, "main sound carrier: %d.%03d MHz\n",
		else
		v4l_dbg(1, msp_debug, client,
		"main sound carrier: %d.%03d MHz\n",
		state->main / 910000, (state->main / 910) % 1000);
		}
		if (state->mode == MSP_MODE_FM_NICAM1 \|\| state->mode == MSP_MODE_FM_NICAM2)
		v4l_dbg(1, msp_debug, client, "NICAM/FM carrier : %d.%03d MHz\n",
		v4l_dbg(1, msp_debug, client,
		"NICAM/FM carrier : %d.%03d MHz\n",
		state->second / 910000, (state->second/910) % 1000);
		if (state->mode == MSP_MODE_AM_NICAM)
		v4l_dbg(1, msp_debug, client, "NICAM/AM carrier : %d.%03d MHz\n",
		v4l_dbg(1, msp_debug, client,
		"NICAM/AM carrier : %d.%03d MHz\n",
		state->second / 910000, (state->second / 910) % 1000);
		if (state->mode == MSP_MODE_FM_TERRA && state->main != state->second) {
		v4l_dbg(1, msp_debug, client, "FM-stereo carrier : %d.%03d MHz\n",
		v4l_dbg(1, msp_debug, client,
		"FM-stereo carrier : %d.%03d MHz\n",
		state->second / 910000, (state->second / 910) % 1000);
		}
		}
		@@ -385,7 +397,8 @@ static int msp3400c_detect_stereo(struct i2c_client *client)
		val = msp_read_dsp(client, 0x18);
		if (val > 32767)
		val -= 65536;
		v4l_dbg(2, msp_debug, client, "stereo detect register: %d\n", val);
		v4l_dbg(2, msp_debug, client,
		"stereo detect register: %d\n", val);
		if (val > 8192) {
		rxsubchans = V4L2_TUNER_SUB_STEREO;
		} else if (val < -4096) {
		@@ -430,7 +443,8 @@ static int msp3400c_detect_stereo(struct i2c_client *client)
		}
		if (rxsubchans != state->rxsubchans) {
		update = 1;
		v4l_dbg(1, msp_debug, client, "watch: rxsubchans %02x => %02x\n",
		v4l_dbg(1, msp_debug, client,
		"watch: rxsubchans %02x => %02x\n",
		state->rxsubchans, rxsubchans);
		state->rxsubchans = rxsubchans;
		}
		@@ -452,9 +466,8 @@ static void watch_stereo(struct i2c_client *client)
		{
		struct msp_state *state = i2c_get_clientdata(client);

		if (msp_detect_stereo(client)) {
		if (msp_detect_stereo(client))
		msp_set_audmode(client);
		}

		if (msp_once)
		state->watch_stereo = 0;
		@@ -465,7 +478,7 @@ int msp3400c_thread(void *data)
		struct i2c_client *client = data;
		struct msp_state *state = i2c_get_clientdata(client);
		struct msp3400c_carrier_detect *cd;
		int count, max1, max2, val1, val2, val, this;
		int count, max1, max2, val1, val2, val, i;


		v4l_dbg(1, msp_debug, client, "msp3400 daemon started\n");
		@@ -483,7 +496,8 @@ int msp3400c_thread(void *data)

		if (state->radio \|\| MSP_MODE_EXTERN == state->mode) {
		/* no carrier scan, just unmute */
		v4l_dbg(1, msp_debug, client, "thread: no carrier scan\n");
		v4l_dbg(1, msp_debug, client,
		"thread: no carrier scan\n");
		state->scan_in_progress = 0;
		msp_set_audio(client);
		continue;
		@@ -514,16 +528,17 @@ int msp3400c_thread(void *data)
		v4l_dbg(1, msp_debug, client, "AM sound override\n");
		}

		for (this = 0; this < count; this++) {
		msp3400c_set_carrier(client, cd[this].cdo, cd[this].cdo);
		for (i = 0; i < count; i++) {
		msp3400c_set_carrier(client, cd[i].cdo, cd[i].cdo);
		if (msp_sleep(state, 100))
		goto restart;
		val = msp_read_dsp(client, 0x1b);
		if (val > 32767)
		val -= 65536;
		if (val1 < val)
		val1 = val, max1 = this;
		v4l_dbg(1, msp_debug, client, "carrier1 val: %5d / %s\n", val,cd[this].name);
		val1 = val, max1 = i;
		v4l_dbg(1, msp_debug, client,
		"carrier1 val: %5d / %s\n", val, cd[i].name);
		}

		/* carrier detect pass #2 -- second (stereo) carrier */
		@@ -550,16 +565,17 @@ int msp3400c_thread(void *data)
		count = 0;
		max2 = 0;
		}
		for (this = 0; this < count; this++) {
		msp3400c_set_carrier(client, cd[this].cdo, cd[this].cdo);
		for (i = 0; i < count; i++) {
		msp3400c_set_carrier(client, cd[i].cdo, cd[i].cdo);
		if (msp_sleep(state, 100))
		goto restart;
		val = msp_read_dsp(client, 0x1b);
		if (val > 32767)
		val -= 65536;
		if (val2 < val)
		val2 = val, max2 = this;
		v4l_dbg(1, msp_debug, client, "carrier2 val: %5d / %s\n", val,cd[this].name);
		val2 = val, max2 = i;
		v4l_dbg(1, msp_debug, client,
		"carrier2 val: %5d / %s\n", val, cd[i].name);
		}

		/* program the msp3400 according to the results */
		@@ -632,7 +648,8 @@ int msp3400c_thread(void *data)
		while (state->watch_stereo) {
		if (msp_sleep(state, count ? 1000 : 5000))
		goto restart;
		if (count) count--;
		if (count)
		count--;
		watch_stereo(client);
		}
		}
		@@ -662,7 +679,8 @@ int msp3410d_thread(void *data)

		if (state->mode == MSP_MODE_EXTERN) {
		/* no carrier scan needed, just unmute */
		v4l_dbg(1, msp_debug, client, "thread: no carrier scan\n");
		v4l_dbg(1, msp_debug, client,
		"thread: no carrier scan\n");
		state->scan_in_progress = 0;
		msp_set_audio(client);
		continue;
		@@ -673,7 +691,8 @@ int msp3410d_thread(void *data)
		msp_set_audio(client);

		/* start autodetect. Note: autodetect is not supported for
		NTSC-M and radio, hence we force the standard in those cases. */
		NTSC-M and radio, hence we force the standard in those
		cases. */
		if (state->radio)
		std = 0x40;
		else
		@@ -686,7 +705,8 @@ int msp3410d_thread(void *data)
		goto restart;

		if (msp_debug)
		v4l_dbg(2, msp_debug, client, "setting standard: %s (0x%04x)\n",
		v4l_dbg(2, msp_debug, client,
		"setting standard: %s (0x%04x)\n",
		msp_standard_std_name(std), std);

		if (std != 1) {
		@@ -703,7 +723,8 @@ int msp3410d_thread(void *data)
		val = msp_read_dem(client, 0x7e);
		if (val < 0x07ff)
		break;
		v4l_dbg(2, msp_debug, client, "detection still in progress\n");
		v4l_dbg(2, msp_debug, client,
		"detection still in progress\n");
		}
		}
		for (i = 0; msp_stdlist[i].name != NULL; i++)
		@@ -716,12 +737,13 @@ int msp3410d_thread(void *data)
		state->std = val;
		state->rxsubchans = V4L2_TUNER_SUB_MONO;

		if (msp_amsound && !state->radio && (state->v4l2_std & V4L2_STD_SECAM) &&
		(val != 0x0009)) {
		if (msp_amsound && !state->radio &&
		(state->v4l2_std & V4L2_STD_SECAM) && (val != 0x0009)) {
		/* autodetection has failed, let backup */
		v4l_dbg(1, msp_debug, client, "autodetection failed,"
		" switching to backup standard: %s (0x%04x)\n",
		msp_stdlist[8].name ? msp_stdlist[8].name : "unknown",val);
		msp_stdlist[8].name ?
		msp_stdlist[8].name : "unknown", val);
		state->std = val = 0x0009;
		msp_write_dem(client, 0x20, val);
		}
		@@ -786,7 +808,8 @@ int msp3410d_thread(void *data)
		while (state->watch_stereo) {
		if (msp_sleep(state, count ? 1000 : 5000))
		goto restart;
		if (count) count--;
		if (count)
		count--;
		watch_stereo(client);
		}
		}
		@@ -872,8 +895,8 @@ static void msp34xxg_set_source(struct i2c_client *client, u16 reg, int in)
		else
		source = (in << 8) \| matrix;

		v4l_dbg(1, msp_debug, client, "set source to %d (0x%x) for output %02x\n",
		in, source, reg);
		v4l_dbg(1, msp_debug, client,
		"set source to %d (0x%x) for output %02x\n", in, source, reg);
		msp_write_dsp(client, reg, source);
		}

		@@ -956,7 +979,8 @@ int msp34xxg_thread(void *data)

		if (state->mode == MSP_MODE_EXTERN) {
		/* no carrier scan needed, just unmute */
		v4l_dbg(1, msp_debug, client, "thread: no carrier scan\n");
		v4l_dbg(1, msp_debug, client,
		"thread: no carrier scan\n");
		state->scan_in_progress = 0;
		msp_set_audio(client);
		continue;
		@@ -972,7 +996,8 @@ int msp34xxg_thread(void *data)
		goto unmute;

		/* watch autodetect */
		v4l_dbg(1, msp_debug, client, "started autodetect, waiting for result\n");
		v4l_dbg(1, msp_debug, client,
		"started autodetect, waiting for result\n");
		for (i = 0; i < 10; i++) {
		if (msp_sleep(state, 100))
		goto restart;
		@@ -983,15 +1008,18 @@ int msp34xxg_thread(void *data)
		state->std = val;
		break;
		}
		v4l_dbg(2, msp_debug, client, "detection still in progress\n");
		v4l_dbg(2, msp_debug, client,
		"detection still in progress\n");
		}
		if (state->std == 1) {
		v4l_dbg(1, msp_debug, client, "detection still in progress after 10 tries. giving up.\n");
		v4l_dbg(1, msp_debug, client,
		"detection still in progress after 10 tries. giving up.\n");
		continue;
		}

		unmute:
		v4l_dbg(1, msp_debug, client, "detected standard: %s (0x%04x)\n",
		v4l_dbg(1, msp_debug, client,
		"detected standard: %s (0x%04x)\n",
		msp_standard_std_name(state->std), state->std);

		if (state->std == 9) {
		@@ -1046,9 +1074,11 @@ static int msp34xxg_detect_stereo(struct i2c_client *client)
		if (state->std == 0x20)
		state->rxsubchans \|= V4L2_TUNER_SUB_SAP;
		else
		state->rxsubchans = V4L2_TUNER_SUB_LANG1 \| V4L2_TUNER_SUB_LANG2;
		state->rxsubchans =
		V4L2_TUNER_SUB_LANG1 \| V4L2_TUNER_SUB_LANG2;
		}
		v4l_dbg(1, msp_debug, client, "status=0x%x, stereo=%d, bilingual=%d -> rxsubchans=%d\n",
		v4l_dbg(1, msp_debug, client,
		"status=0x%x, stereo=%d, bilingual=%d -> rxsubchans=%d\n",
		status, is_stereo, is_bilingual, state->rxsubchans);
		return (oldrx != state->rxsubchans);
		}