---

yaml --- r: 330606 b: refs/heads/master c: 823eeba h: refs/heads/master v: v3
git-mirror · Aug 4, 2012 · 258b23f · 258b23f
1 parent a8e2096
commit 258b23f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d496eb8ae49e4fbaae43ac2115db0efe20d37556
+refs/heads/master: 823eebac89f7adef3fb75e2a68e9e88be9b4afbe
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
@@ -393,7 +393,7 @@ int dvb_usbv2_probe(struct usb_interface *intf,
 
 	if (d->intf->cur_altsetting->desc.bInterfaceNumber !=
 			d->props.bInterfaceNumber) {
-		ret = 0;
+		ret = -ENODEV;
 		goto err_kfree;
 	}
 
@@ -419,7 +419,7 @@ EXPORT_SYMBOL(dvb_usbv2_probe);
 void dvb_usbv2_disconnect(struct usb_interface *intf)
 {
 	struct dvb_usb_device *d = usb_get_intfdata(intf);
-	const char *name = "generic DVB-USB module";
+	const char *name;
 
 	pr_debug("%s: pid=%d work_pid=%d\n", __func__, current->pid,
 			d->work_pid);
@@ -428,10 +428,8 @@ void dvb_usbv2_disconnect(struct usb_interface *intf)
 	if (d->work_pid != current->pid)
 		cancel_work_sync(&d->probe_work);
 
-	if (d) {
-		name = d->name;
-		dvb_usbv2_exit(d);
-	}
+	name = d->name;
+	dvb_usbv2_exit(d);
 
 	pr_info("%s: '%s' successfully deinitialized and disconnected\n",
 			KBUILD_MODNAME, name);