From: Adrian Bunk <bunk@kernel.org>
Date: Thu, 5 Jun 2008 18:24:10 +0000 (+0300)
Subject: [ALSA] usbaudio.c: remove #ifndef CONFIG_USB_EHCI_SPLIT_ISO code
X-Git-Tag: v2.6.27-rc1~1111^2~110
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33b9cd8214d6e385fcd63c321252a359ee96d568;p=linux-2.6

[ALSA] usbaudio.c: remove #ifndef CONFIG_USB_EHCI_SPLIT_ISO code

Since USB_EHCI_SPLIT_ISO is now unconditionally enabled the
#ifndef CONFIG_USB_EHCI_SPLIT_ISO became wrong.

Reported-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 410be4aff1..b8cfb7c227 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -819,10 +819,6 @@ static const char *usb_error_string(int err)
 		return "device disabled";
 	case -EHOSTUNREACH:
 		return "device suspended";
-#ifndef CONFIG_USB_EHCI_SPLIT_ISO
-	case -ENOSYS:
-		return "enable CONFIG_USB_EHCI_SPLIT_ISO to play through a hub";
-#endif
 	case -EINVAL:
 	case -EAGAIN:
 	case -EFBIG: