diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-08 07:26:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-08 07:26:00 -0300 |
| commit | 18e4796addabb3886c9346e035ee30bb96bbcd74 (patch) | |
| tree | d7b57fee9575f514f8adc65b0950b9cd3e18ca54 /linux/drivers/media/video/saa7134 | |
| parent | b88deea9a553735a8113b546758e9c41466a409e (diff) | |
| parent | eefeb3e20d73aae1bd829278f7aa73245eb34eff (diff) | |
| download | mediapointer-dvb-s2-18e4796addabb3886c9346e035ee30bb96bbcd74.tar.gz mediapointer-dvb-s2-18e4796addabb3886c9346e035ee30bb96bbcd74.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-dvb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c index 2659d2a60..a5a2d5905 100644 --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c @@ -1345,7 +1345,8 @@ static int dvb_init(struct saa7134_dev *dev) return ret; dettach_frontend: - dvb_frontend_detach(dev->dvb.frontend); + if (dev->dvb.frontend) + dvb_frontend_detach(dev->dvb.frontend); dev->dvb.frontend = NULL; return -1; |