Skip to content

Commit

Permalink
staging/easycap: easycap_probe: take out duplicated code from ifdef -…
Browse files Browse the repository at this point in the history
… 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>
  • Loading branch information
Tomas Winkler authored and Greg Kroah-Hartman committed Apr 21, 2011
1 parent 11ff12f commit ad30d7a
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions drivers/staging/easycap/easycap_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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;
}
/*---------------------------------------------------------------------------*/
Expand Down

0 comments on commit ad30d7a

Please sign in to comment.