From ad30d7af14c778a63304e42acdcedc365b26e8d8 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Wed, 6 Apr 2011 17:37:34 +0300 Subject: staging/easycap: easycap_probe: take out duplicated code from ifdef - else Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman --- drivers/staging/easycap/easycap_main.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'drivers') diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/easycap/easycap_main.c index 68b1f4fd1cd1..1845cce737ae 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; } /*---------------------------------------------------------------------------*/ -- cgit v1.2.3-55-g7522