From: Steven Toth Date: Tue, 29 Jul 2008 02:01:35 +0000 (-0400) Subject: DVB: cx23885: Ensure PAD_CTRL is always reset to a sensible default X-Git-Tag: v2.6.26.1~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d44fda9d047d4b293646b4cb3a0f448a6f07c018;p=thirdparty%2Fkernel%2Fstable.git DVB: cx23885: Ensure PAD_CTRL is always reset to a sensible default (cherry picked from commit ecda5966c90746a044ff68e78b1062adcddd9664) DVB: cx23885: Ensure PAD_CTRL is always reset to a sensible default PAD_CTRL controls TS1 and TS2 input and output states, if the register became corrupt the driver was never able to recover. Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Michael Krufky Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c index fe5c09a068327..c6e9498f746e4 100644 --- a/drivers/media/video/cx23885/cx23885-core.c +++ b/drivers/media/video/cx23885/cx23885-core.c @@ -460,6 +460,7 @@ static void cx23885_reset(struct cx23885_dev *dev) cx_write(AUDIO_INT_INT_STAT, 0xffffffff); cx_write(AUDIO_EXT_INT_STAT, 0xffffffff); cx_write(CLK_DELAY, cx_read(CLK_DELAY) & 0x80000000); + cx_write(PAD_CTRL, 0x00500300); mdelay(100);