---

yaml --- r: 330597 b: refs/heads/master c: 3676403 h: refs/heads/master i: 330595: fee9836 v: v3
git-mirror · Aug 4, 2012 · e3c79be · e3c79be
1 parent 00aae46
commit e3c79be
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b8c8c40894a88035fb29472a25f6864cd2e8197
+refs/heads/master: 36764037640e1892d769cfcfe1df51b985d84563
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -172,6 +172,7 @@ struct dvb_usb_device_properties {
 	const char *driver_name;
 	struct module *owner;
 	short *adapter_nr;
+	u8 bInterfaceNumber;
 
 	int size_of_priv;
 

diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
@@ -350,7 +350,8 @@ int dvb_usbv2_probe(struct usb_interface *intf,
 	struct dvb_usb_driver_info *driver_info =
 			(struct dvb_usb_driver_info *) id->driver_info;
 
-	pr_debug("%s:\n", __func__);
+	pr_debug("%s: bInterfaceNumber=%d\n", __func__,
+			intf->cur_altsetting->desc.bInterfaceNumber);
 
 	if (!id->driver_info) {
 		pr_err("%s: driver_info failed\n", KBUILD_MODNAME);
@@ -371,6 +372,13 @@ int dvb_usbv2_probe(struct usb_interface *intf,
 	d->intf = intf;
 	memcpy(&d->props, driver_info->props,
 			sizeof(struct dvb_usb_device_properties));
+
+	if (d->intf->cur_altsetting->desc.bInterfaceNumber !=
+			d->props.bInterfaceNumber) {
+		ret = 0;
+		goto exit_kfree;
+	}
+
 	mutex_init(&d->usb_mutex);
 	mutex_init(&d->i2c_mutex);
 	INIT_WORK(&d->probe_work, dvb_usbv2_init_work);
@@ -384,6 +392,7 @@ int dvb_usbv2_probe(struct usb_interface *intf,
 	return 0;
 err_kfree:
 	usb_set_intfdata(intf, NULL);
+exit_kfree:
 	kfree(d);
 err:
 	pr_debug("%s: failed=%d\n", __func__, ret);