From 6c74906cd358a1a65273ccaa1898ef00ed20722b Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Wed, 6 Apr 2011 17:37:34 +0300 Subject: [PATCH] --- yaml --- r: 249097 b: refs/heads/master c: ad30d7af14c778a63304e42acdcedc365b26e8d8 h: refs/heads/master i: 249095: a23543d9c33df5965a46217c4ee68b157af2a2ef v: v3 --- [refs] | 2 +- trunk/drivers/staging/easycap/easycap_main.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index da101d44bceb..60ca83caa9f8 100644 --- 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 index 68b1f4fd1cd1..1845cce737ae 100644 --- 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; } /*---------------------------------------------------------------------------*/