3 files changed, 32 insertions, 10 deletions

diff --git a/drivers/usb/class/Kconfig b/drivers/usb/class/Kconfig
index 0561d0234f23..333e39bb105f 100644
--- a/drivers/usb/class/Kconfig
+++ b/drivers/usb/class/Kconfig
@@ -4,9 +4,22 @@
 comment "USB Device Class drivers"
         depends on USB
 
+config OBSOLETE_OSS_USB_DRIVER
+        bool "Obsolete OSS USB drivers"
+        depends on USB && SOUND
+        help
+          This option enables support for the obsolete USB Audio and Midi
+          drivers that are scheduled for removal in the near future since
+          there are ALSA drivers for the same hardware.
+
+          Please contact Adrian Bunk <bunk@stusta.de> if you had to
+          say Y here because of missing support in the ALSA drivers.
+
+          If unsure, say N.
+
 config USB_AUDIO
         tristate "USB Audio support"
-        depends on USB && SOUND
+        depends on USB && SOUND && OBSOLETE_OSS_USB_DRIVER
         help
           Say Y here if you want to connect USB audio equipment such as
           speakers to your computer's USB port. You only need this if you use
@@ -40,10 +53,12 @@ config USB_BLUETOOTH_TTY
 
 config USB_MIDI
         tristate "USB MIDI support"
-        depends on USB && SOUND
+        depends on USB && SOUND && OBSOLETE_OSS_USB_DRIVER
         ---help---
           Say Y here if you want to connect a USB MIDI device to your
-          computer's USB port. This driver is for devices that comply with
+          computer's USB port.  You only need this if you use the OSS
+          sound system; USB MIDI devices are supported by ALSA's USB
+          audio driver. This driver is for devices that comply with
           'Universal Serial Bus Device Class Definition for MIDI Device'.
 
           The following devices are known to work:
diff --git a/drivers/usb/class/audio.c b/drivers/usb/class/audio.c
index f8f21567cc22..50858273f8d3 100644
--- a/drivers/usb/class/audio.c
+++ b/drivers/usb/class/audio.c
@@ -631,8 +631,10 @@ static void usbin_stop(struct usb_audiodev *as)
         i = u->flags;
         spin_unlock_irqrestore(&as->lock, flags);
         while (i & (FLG_URB0RUNNING|FLG_URB1RUNNING|FLG_SYNC0RUNNING|FLG_SYNC1RUNNING)) {
-                set_current_state(notkilled ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                if (notkilled)
+                        schedule_timeout_interruptible(1);
+                else
+                        schedule_timeout_uninterruptible(1);
                 spin_lock_irqsave(&as->lock, flags);
                 i = u->flags;
                 spin_unlock_irqrestore(&as->lock, flags);
@@ -1102,8 +1104,10 @@ static void usbout_stop(struct usb_audiodev *as)
         i = u->flags;
         spin_unlock_irqrestore(&as->lock, flags);
         while (i & (FLG_URB0RUNNING|FLG_URB1RUNNING|FLG_SYNC0RUNNING|FLG_SYNC1RUNNING)) {
-                set_current_state(notkilled ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                if (notkilled)
+                        schedule_timeout_interruptible(1);
+                else
+                        schedule_timeout_uninterruptible(1);
                 spin_lock_irqsave(&as->lock, flags);
                 i = u->flags;
                 spin_unlock_irqrestore(&as->lock, flags);
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index 7ce43fb8118a..e195709c9c7f 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -310,8 +310,9 @@ static int usblp_check_status(struct usblp *usblp, int err)
 
         error = usblp_read_status (usblp, usblp->statusbuf);
         if (error < 0) {
-                err("usblp%d: error %d reading printer status",
-                        usblp->minor, error);
+                if (printk_ratelimit())
+                        err("usblp%d: error %d reading printer status",
+                                usblp->minor, error);
                 return 0;
         }
 
@@ -604,7 +605,9 @@ static int usblp_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 
                         case LPGETSTATUS:
                                 if (usblp_read_status(usblp, usblp->statusbuf)) {
-                                        err("usblp%d: failed reading printer status", usblp->minor);
+                                        if (printk_ratelimit())
+                                                err("usblp%d: failed reading printer status",
+                                                        usblp->minor);
                                         retval = -EIO;
                                         goto done;
                                 }