---

yaml --- r: 330607 b: refs/heads/master c: 5b6a63c h: refs/heads/master i: 330605: a8e2096 330603: 1d1b9c6 330599: d257c0b 330591: 14b231f v: v3
git-mirror · Aug 4, 2012 · 2ecfee9 · 2ecfee9
1 parent 258b23f
commit 2ecfee9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 823eebac89f7adef3fb75e2a68e9e88be9b4afbe
+refs/heads/master: 5b6a63cc2f11a9b00862d13104d1304e082acfe5
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -195,6 +195,7 @@ struct dvb_usb_device_properties {
 #define COLD                  1
 	int (*identify_state) (struct dvb_usb_device *);
 	int (*init) (struct dvb_usb_device *);
+	void (*disconnect) (struct dvb_usb_device *);
 	int (*get_rc_config) (struct dvb_usb_device *, struct dvb_usb_rc *);
 	int (*get_usb_stream_config) (struct dvb_frontend *,
 			struct usb_data_stream_properties *);

diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
@@ -428,6 +428,9 @@ void dvb_usbv2_disconnect(struct usb_interface *intf)
 	if (d->work_pid != current->pid)
 		cancel_work_sync(&d->probe_work);
 
+	if (d->props.disconnect)
+		d->props.disconnect(d);
+
 	name = d->name;
 	dvb_usbv2_exit(d);