aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/easycap
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2011-02-21 16:09:55 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-23 14:15:35 -0800
commitfc3cc2caa07568de92cc84780b89b5cf9fbf28b7 (patch)
tree828e2278581752c375d08a9478a2a726b4331c57 /drivers/staging/easycap
parentdfcce7bf0913cc81d57a41d8da3175b201ec1664 (diff)
downloadkernel_samsung_smdk4412-fc3cc2caa07568de92cc84780b89b5cf9fbf28b7.zip
kernel_samsung_smdk4412-fc3cc2caa07568de92cc84780b89b5cf9fbf28b7.tar.gz
kernel_samsung_smdk4412-fc3cc2caa07568de92cc84780b89b5cf9fbf28b7.tar.bz2
staging/easycap: use USB_SUBCLASS_AUDIOSTREAMING instead of 0x02
use USB_SUBCLASS_AUDIOSTREAMING constant from usb/audio.h instead of 0x02 Cc: Mike Thomas <rmthomas@sciolus.org> Cc: Dan Carpenter <error27@gmail.com> 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.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/easycap/easycap_main.c
index ea8a2e0..fc1a178 100644
--- a/drivers/staging/easycap/easycap_main.c
+++ b/drivers/staging/easycap/easycap_main.c
@@ -29,6 +29,7 @@
/*****************************************************************************/
#include "easycap.h"
+#include <linux/usb/audio.h>
MODULE_LICENSE("GPL");
@@ -3494,7 +3495,7 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface,
}
}
} else if ((USB_CLASS_AUDIO == bInterfaceClass) &&
- (0x02 == bInterfaceSubClass)) {
+ (USB_SUBCLASS_AUDIOSTREAMING == bInterfaceSubClass)) {
if (-1 == peasycap->audio_interface) {
peasycap->audio_interface = bInterfaceNumber;
JOM(4, "setting peasycap->audio_interface=%i\n",
@@ -3654,7 +3655,8 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface,
break;
}
case USB_CLASS_AUDIO: {
- if (0x02 != bInterfaceSubClass)
+ if (bInterfaceSubClass !=
+ USB_SUBCLASS_AUDIOSTREAMING)
break;
if (!peasycap) {
SAM("MISTAKE: "