From: Antti Palosaari <crope@iki.fi>
Date: Sun, 10 Jun 2012 02:42:47 +0000 (-0300)
Subject: [media] dvb_usb_v2: probe/disconnect error handling
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=823eebac89f7adef3fb75e2a68e9e88be9b4afbe;p=linux-edison.git

[media] dvb_usb_v2: probe/disconnect error handling

In my understanding we never call .disconnect() when .probe()
returns error. Change .probe() to return error all cases it cannot
handle given interface and simplify .disconnect() handling.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/drivers/media/dvb/dvb-usb/dvb_usb_init.c
index 2d0fbaf6c6d..1f0fb11c587 100644
--- a/drivers/media/dvb/dvb-usb/dvb_usb_init.c
+++ b/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);