diff --git a/[refs] b/[refs] index 90a9d381adeb..8dd6ae2a683e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ac5881aefc2dab8b3535c2e44fee6628acaf787 +refs/heads/master: 5206d6ec36e2c66090c3c02c95b8d70c356a9ad3 diff --git a/trunk/drivers/media/video/cx23885/cx23885-cards.c b/trunk/drivers/media/video/cx23885/cx23885-cards.c index aa0ddf2ea224..901bebcca7c3 100644 --- a/trunk/drivers/media/video/cx23885/cx23885-cards.c +++ b/trunk/drivers/media/video/cx23885/cx23885-cards.c @@ -268,7 +268,13 @@ void cx23885_gpio_setup(struct cx23885_dev *dev) /* GPIO-15-18 cx23417 READY, CS, RD, WR */ /* GPIO-19 IR_RX */ - cx_set(GP0_IO, 0x00040004); /* Bring the tuner out of reset */ + /* Force the TDA8295A into reset and back */ + cx_set(GP0_IO, 0x00040004); + mdelay(20); + cx_clear(GP0_IO, 0x00000004); + mdelay(20); + cx_set(GP0_IO, 0x00040004); + mdelay(20); break; } }