Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de21eb63 authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by Linus Torvalds
Browse files

[PATCH] fix black/white-only svideo input in vpx3220 decoder 



Fix the fact that the svideo input will only give input in black/white in
some circumstances.  Reason is that in the PCI controller driver (zr36067),
after setting input, we reset norm, which overwrites the input register
with the default.  This patch makes it always set the correct value for the
input when changing norm.

Signed-off-by: default avatarRonald S. Bultje <rbultje@ronald.bitfreak.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9b3acc21

drivers/media/video/vpx3220.c

+10 −0
Original line number Diff line number Diff line
@@ -408,6 +408,12 @@ vpx3220_command (struct i2c_client *client, 
	case DECODER_SET_NORM:

	{

		int *iarg = arg, data;

		int temp_input;



		/* Here we back up the input selection because it gets

		   overwritten when we fill the registers with the

                   choosen video norm */

		temp_input = vpx3220_fp_read(client, 0xf2);



		dprintk(1, KERN_DEBUG "%s: DECODER_SET_NORM %d\n",

			I2C_NAME(client), *iarg);
@@ -447,6 +453,10 @@ vpx3220_command (struct i2c_client *client, 


		}

		decoder->norm = *iarg;



		/* And here we set the backed up video input again */

		vpx3220_fp_write(client, 0xf2, temp_input | 0x0010);

		udelay(10);

	}

		break;