diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-18 03:01:09 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-18 03:01:09 -0300 |
| commit | 5e16d2eb4d2c6cbdb0e47d3918bb2b826748a4c4 (patch) | |
| tree | a7da2e7bfbc5a985f41fe77dee7c0d5a56dd4f9c /linux/drivers/media/dvb | |
| parent | 0144095d5249bc72fdc5930fa52de0fc29a5ac6f (diff) | |
| parent | 6d83195593e60b67de6cfd569b5138e70af93408 (diff) | |
| download | mediapointer-dvb-s2-5e16d2eb4d2c6cbdb0e47d3918bb2b826748a4c4.tar.gz mediapointer-dvb-s2-5e16d2eb4d2c6cbdb0e47d3918bb2b826748a4c4.tar.bz2 | |
merge: http://kernellabs.com/hg/~dheitmueller/em28xx-isoc-fix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_frontend.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dib0700_devices.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c index da2890b22..d359f6841 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c @@ -554,6 +554,7 @@ restart: if (kthread_should_stop() || dvb_frontend_is_exiting(fe)) { /* got signal or quitting */ + fepriv->exit = 1; break; } diff --git a/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c b/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c index e39993df0..ac97b9f42 100644 --- a/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c @@ -1346,9 +1346,9 @@ static int dib0700_xc5000_tuner_callback(void *priv, int component, if (command == XC5000_TUNER_RESET) { /* Reset the tuner */ dib0700_set_gpio(adap->dev, GPIO1, GPIO_OUT, 0); - msleep(330); /* from Windows USB trace */ + msleep(10); dib0700_set_gpio(adap->dev, GPIO1, GPIO_OUT, 1); - msleep(330); /* from Windows USB trace */ + msleep(10); } else { err("xc5000: unknown tuner callback command: %d\n", command); return -EINVAL; |