aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-09-04 09:30:49 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-23 12:49:52 -0400
commit4699903e4f765af7f9d7b3d63c576290c375c47d (patch)
tree8ba7eed82ea56ebe31bab1d18e03e7608acd6eac
parent9a888ba273b8bbd82a0b88cfd57c270f6eb8d724 (diff)
[media] cx88: Fix reset delays
This was reported in March 2011 by Mirek Slugen, and a simple fix posted at the time then never got fixed and applied. The bug is still present. Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=37703 Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/pci/cx88/cx88-cards.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-cards.c
index 4e9d4f722960..0c255248cbcd 100644
--- a/drivers/media/pci/cx88/cx88-cards.c
+++ b/drivers/media/pci/cx88/cx88-cards.c
@@ -3028,9 +3028,9 @@ static int cx88_xc3028_winfast1800h_callback(struct cx88_core *core,
3028 cx_set(MO_GP1_IO, 0x1010); 3028 cx_set(MO_GP1_IO, 0x1010);
3029 mdelay(50); 3029 mdelay(50);
3030 cx_clear(MO_GP1_IO, 0x10); 3030 cx_clear(MO_GP1_IO, 0x10);
3031 mdelay(50); 3031 mdelay(75);
3032 cx_set(MO_GP1_IO, 0x10); 3032 cx_set(MO_GP1_IO, 0x10);
3033 mdelay(50); 3033 mdelay(75);
3034 return 0; 3034 return 0;
3035 } 3035 }
3036 return -EINVAL; 3036 return -EINVAL;