diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-13 10:29:34 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-13 10:29:34 -0300 |
| commit | 566bd7b8b0b4e1e585437231d1f8a4d152f5bb27 (patch) | |
| tree | f5970e88b5e605323886c1f872aa1e9225f827a5 /linux/drivers/media/video | |
| parent | 6085c418e42063695cf895d7af008edc36f3fde2 (diff) | |
| parent | ab30f3b84e41060d3e038b977b5fd2a3ff045768 (diff) | |
| download | mediapointer-dvb-s2-566bd7b8b0b4e1e585437231d1f8a4d152f5bb27.tar.gz mediapointer-dvb-s2-566bd7b8b0b4e1e585437231d1f8a4d152f5bb27.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-dvb.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index d6397b9a0..8559ef873 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -964,7 +964,8 @@ static int cx8802_dvb_remove(struct cx8802_driver *drv) struct cx8802_dev *dev = drv->core->dvbdev; /* dvb */ - videobuf_dvb_unregister(&dev->dvb); + if (dev->dvb.frontend) + videobuf_dvb_unregister(&dev->dvb); vp3054_i2c_remove(dev); diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c index 66c08fdf1..19f5b1d34 100644 --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c @@ -1312,7 +1312,8 @@ static int dvb_fini(struct saa7134_dev *dev) } } } - videobuf_dvb_unregister(&dev->dvb); + if (dev->dvb.frontend) + videobuf_dvb_unregister(&dev->dvb); return 0; } |