From 12e7248f4cd2bae5fb07194d680ec69c9e3d5c2c Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Mon, 21 Feb 2011 16:09:55 +0200
Subject: [PATCH] --- yaml --- r: 236110 b: refs/heads/master c:
 fc3cc2caa07568de92cc84780b89b5cf9fbf28b7 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/easycap/easycap_main.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a4d82e52fad0..a13e87cfa911 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfcce7bf0913cc81d57a41d8da3175b201ec1664
+refs/heads/master: fc3cc2caa07568de92cc84780b89b5cf9fbf28b7
diff --git a/trunk/drivers/staging/easycap/easycap_main.c b/trunk/drivers/staging/easycap/easycap_main.c
index ea8a2e0e184d..fc1a1781227e 100644
--- a/trunk/drivers/staging/easycap/easycap_main.c
+++ b/trunk/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: "