diff options
| author | Mike Thomas <rmthomas@sciolus.org> | 2011-01-10 18:41:11 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-21 12:25:55 -0800 |
| commit | a9855917290fc40dbfd67d3ee06c190667d6c5b5 (patch) | |
| tree | b24a96d42526d681d04c6e678fe0649f4a25ba45 /drivers/staging/easycap/easycap_low.c | |
| parent | b54a28a418b2730bf61554864fee3fb24f79e182 (diff) | |
| download | op-kernel-dev-a9855917290fc40dbfd67d3ee06c190667d6c5b5.zip op-kernel-dev-a9855917290fc40dbfd67d3ee06c190667d6c5b5.tar.gz | |
staging: easycap: add ALSA support
This is necessary because some distributions are disabling OSS entirely.
Signed-off-by: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/easycap/easycap_low.c')
| -rw-r--r-- | drivers/staging/easycap/easycap_low.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/staging/easycap/easycap_low.c b/drivers/staging/easycap/easycap_low.c index 28c4d1e..b618d4b 100644 --- a/drivers/staging/easycap/easycap_low.c +++ b/drivers/staging/easycap/easycap_low.c @@ -39,7 +39,7 @@ /****************************************************************************/ #include "easycap.h" -#include "easycap_debug.h" +#include "easycap_low.h" /*--------------------------------------------------------------------------*/ const struct stk1160config { int reg; int set; } stk1160configPAL[256] = { @@ -1052,9 +1052,18 @@ rc = usb_control_msg(pusb_device, usb_sndctrlpipe(pusb_device, 0), \ (int)50000); JOT(8, "0x%02X=buffer\n", *((__u8 *) &buffer[0])); -if (rc != (int)length) - SAY("ERROR: usb_control_msg returned %i\n", rc); - +if (rc != (int)length) { + switch (rc) { + case -EPIPE: { + SAY("usb_control_msg returned -EPIPE\n"); + break; + } + default: { + SAY("ERROR: usb_control_msg returned %i\n", rc); + break; + } + } +} /*--------------------------------------------------------------------------*/ /* * REGISTER 500: SETTING VALUE TO 0x0094 RESETS AUDIO CONFIGURATION ??? |
