---

yaml --- r: 330659 b: refs/heads/master c: b62fd17 h: refs/heads/master i: 330657: 3f48edc 330655: 5d34d32 v: v3
git-mirror · Aug 4, 2012 · 12a5da7 · 12a5da7
1 parent 602833e
commit 12a5da7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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;