---

yaml --- r: 249097 b: refs/heads/master c: ad30d7a h: refs/heads/master i: 249095: a23543d v: v3
git-mirror · Apr 21, 2011 · 6c74906 · 6c74906
1 parent 6b83142
commit 6c74906
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11ff12feb40dc663cad0f2da86729f1af9d1356e
+refs/heads/master: ad30d7af14c778a63304e42acdcedc365b26e8d8
diff --git a/trunk/drivers/staging/easycap/easycap_main.c b/trunk/drivers/staging/easycap/easycap_main.c
@@ -4183,11 +4183,6 @@ static int easycap_usb_probe(struct usb_interface *intf,
 		if (rc) {
 			err("easycap_alsa_probe() rc = %i\n", rc);
 			return -ENODEV;
-		} else {
-			JOM(8, "kref_get() with %i=kref.refcount.counter\n",
-					peasycap->kref.refcount.counter);
-			kref_get(&peasycap->kref);
-			peasycap->registered_audio++;
 		}
 
 #else /* CONFIG_EASYCAP_OSS */
@@ -4196,15 +4191,14 @@ static int easycap_usb_probe(struct usb_interface *intf,
 			SAY("ERROR: usb_register_dev() failed\n");
 			usb_set_intfdata(intf, NULL);
 			return -ENODEV;
-		} else {
-			JOM(8, "kref_get() with %i=kref.refcount.counter\n",
-					peasycap->kref.refcount.counter);
-			kref_get(&peasycap->kref);
-			peasycap->registered_audio++;
 		}
 		SAM("easyoss attached to minor #%d\n", intf->minor);
 #endif /* CONFIG_EASYCAP_OSS */
 
+		JOM(8, "kref_get() with %i=kref.refcount.counter\n",
+				peasycap->kref.refcount.counter);
+		kref_get(&peasycap->kref);
+		peasycap->registered_audio++;
 		break;
 	}
 /*---------------------------------------------------------------------------*/