From 12a5da7fb4e76e95dd6292a48615646d20f7aa7f Mon Sep 17 00:00:00 2001 From: Antti Palosaari Date: Tue, 26 Jun 2012 22:49:19 -0300 Subject: [PATCH] --- yaml --- r: 330659 b: refs/heads/master c: b62fd172ff1da93a0c720639e1f64f2a4282f943 h: refs/heads/master i: 330657: 3f48edc956ee7ec98dc2dd418d0864eeb07d89db 330655: 5d34d32b4e8805d9cf6f38d1e74a6118ea12c187 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/dvb_usb_core.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 82d8c6117818..15a85e9c85c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d10d1b9ac97b96dd9183944d30b1664bdbb5fbf6 +refs/heads/master: b62fd172ff1da93a0c720639e1f64f2a4282f943 diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_core.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_core.c index 920542c0b672..aed7463167bc 100644 --- a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_core.c +++ b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_core.c @@ -717,9 +717,11 @@ static int dvb_usbv2_adapter_exit(struct dvb_usb_device *d) dev_dbg(&d->udev->dev, "%s:\n", __func__); for (i = MAX_NO_OF_ADAPTER_PER_DEVICE - 1; i >= 0; i--) { - dvb_usbv2_adapter_frontend_exit(&d->adapter[i]); - dvb_usbv2_adapter_dvb_exit(&d->adapter[i]); - dvb_usbv2_adapter_stream_exit(&d->adapter[i]); + if (d->adapter[i].props) { + dvb_usbv2_adapter_frontend_exit(&d->adapter[i]); + dvb_usbv2_adapter_dvb_exit(&d->adapter[i]); + dvb_usbv2_adapter_stream_exit(&d->adapter[i]); + } } return 0;