summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bt8xx/bttv-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-09-02 08:39:29 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-09-02 08:39:29 -0300
commit5b13fd9ada96757a97270032bc1cf1d2f90036e2 (patch)
treee50e4f9fca08bd465377df7ccba936282203061b /linux/drivers/media/video/bt8xx/bttv-cards.c
parentf718582c720ea5aed974cdbaf09c4abe8ed3764a (diff)
parent6bf76aa3cd9b7abb05cf8f580991400149c40ac2 (diff)
downloadmediapointer-dvb-s2-5b13fd9ada96757a97270032bc1cf1d2f90036e2.tar.gz
mediapointer-dvb-s2-5b13fd9ada96757a97270032bc1cf1d2f90036e2.tar.bz2
merge: http://linuxtv.org/hg/~jfrancois/gspca/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-cards.c')
-rw-r--r--linux/drivers/media/video/bt8xx/bttv-cards.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c
index 9c4e77393..d67e127f1 100644
--- a/linux/drivers/media/video/bt8xx/bttv-cards.c
+++ b/linux/drivers/media/video/bt8xx/bttv-cards.c
@@ -4113,7 +4113,8 @@ static void __devinit boot_msp34xx(struct bttv *btv, int pin)
gpio_inout(mask,mask);
gpio_bits(mask,0);
- udelay(2500);
+ mdelay(2);
+ udelay(500);
gpio_bits(mask,mask);
if (bttv_gpio)