diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2011-04-06 17:37:34 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-20 18:08:07 -0700 |
| commit | ad30d7af14c778a63304e42acdcedc365b26e8d8 (patch) | |
| tree | 2db26b844c130dc6d9de019fad74c4cd64a43a59 /drivers/staging/easycap | |
| parent | 11ff12feb40dc663cad0f2da86729f1af9d1356e (diff) | |
| download | kernel_samsung_smdk4412-ad30d7af14c778a63304e42acdcedc365b26e8d8.zip kernel_samsung_smdk4412-ad30d7af14c778a63304e42acdcedc365b26e8d8.tar.gz kernel_samsung_smdk4412-ad30d7af14c778a63304e42acdcedc365b26e8d8.tar.bz2 | |
staging/easycap: easycap_probe: take out duplicated code from ifdef - else
Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/easycap')
| -rw-r--r-- | drivers/staging/easycap/easycap_main.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/easycap/easycap_main.c index 68b1f4f..1845cce 100644 --- a/drivers/staging/easycap/easycap_main.c +++ b/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; } /*---------------------------------------------------------------------------*/ |