Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236110
b: refs/heads/master
c: fc3cc2c
h: refs/heads/master
v: v3
  • Loading branch information
Tomas Winkler authored and Greg Kroah-Hartman committed Feb 23, 2011
1 parent 068adb7 commit 12e7248
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dfcce7bf0913cc81d57a41d8da3175b201ec1664
refs/heads/master: fc3cc2caa07568de92cc84780b89b5cf9fbf28b7
6 changes: 4 additions & 2 deletions trunk/drivers/staging/easycap/easycap_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
/*****************************************************************************/

#include "easycap.h"
#include <linux/usb/audio.h>


MODULE_LICENSE("GPL");
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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: "
Expand Down

0 comments on commit 12e7248

Please sign in to comment.