evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging/easycap: easycap_probe: take out duplicated code from ifdef - else

Browse source 
Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Tomas Winkler 2011-04-06 17:37:34 +03:00 • committed by Greg Kroah-Hartman
parent 11ff12feb4
commit ad30d7af14
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/staging/easycap/easycap_main.c
View file

@ -4183,11 +4183,6 @@ static int easycap_usb_probe(struct usb_interface *intf,
if (rc) { if (rc) {
err("easycap_alsa_probe() rc = %i\n", rc); err("easycap_alsa_probe() rc = %i\n", rc);
return -ENODEV; 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 */ #else /* CONFIG_EASYCAP_OSS */
@ -4196,15 +4191,14 @@ static int easycap_usb_probe(struct usb_interface *intf,
SAY("ERROR: usb_register_dev() failed\n"); SAY("ERROR: usb_register_dev() failed\n");
usb_set_intfdata(intf, NULL); usb_set_intfdata(intf, NULL);
return -ENODEV; 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); SAM("easyoss attached to minor #%d\n", intf->minor);
#endif /* CONFIG_EASYCAP_OSS */ #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; break;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/