From b0c98a2cd8c3329765929ab261ed3dd919aef1ce Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 11 Apr 2008 11:29:44 -0300 Subject: [PATCH] --- yaml --- r: 92626 b: refs/heads/master c: 9950c1b5b4b86d4aae12853c2f0a0ef11d976764 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx88/cx88-dvb.c | 3 ++- trunk/drivers/media/video/saa7134/saa7134-dvb.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b1689b8fb7e1..0747cbb59f6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb7b37cf913c19dbdbb9bf3e653924e126b4007e +refs/heads/master: 9950c1b5b4b86d4aae12853c2f0a0ef11d976764 diff --git a/trunk/drivers/media/video/cx88/cx88-dvb.c b/trunk/drivers/media/video/cx88/cx88-dvb.c index 8fc929eb47ba..e83d9869e68b 100644 --- a/trunk/drivers/media/video/cx88/cx88-dvb.c +++ b/trunk/drivers/media/video/cx88/cx88-dvb.c @@ -951,7 +951,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/trunk/drivers/media/video/saa7134/saa7134-dvb.c b/trunk/drivers/media/video/saa7134/saa7134-dvb.c index 5c84f45ecbe2..e5c3569dd2c8 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-dvb.c +++ b/trunk/drivers/media/video/saa7134/saa7134-dvb.c @@ -1302,7 +1302,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; }