10 files changed, 49 insertions, 140 deletions

diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c
index c79a9afd0955..c7e1b2646193 100644
--- a/sound/arm/sa11xx-uda1341.c
+++ b/sound/arm/sa11xx-uda1341.c
@@ -125,7 +125,7 @@ struct audio_stream {
 #else
         dma_regs_t *dma_regs;   /* points to our DMA registers */
 #endif
-        int active:1;           /* we are using this stream for transfer now */
+        unsigned int active:1;  /* we are using this stream for transfer now */
         int period;             /* current transfer period */
         int periods;            /* current count of periods registerd in the DMA engine */
         int tx_spin;            /* are we recoding - flag used to do DMA trans. for sync */
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 66e24b5da469..6ea67b16c676 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -3027,7 +3027,7 @@ static struct page * snd_pcm_mmap_status_nopage(struct vm_area_struct *area,
         struct page * page;
         
         if (substream == NULL)
-                return NOPAGE_OOM;
+                return NOPAGE_SIGBUS;
         runtime = substream->runtime;
         page = virt_to_page(runtime->status);
         get_page(page);
@@ -3070,7 +3070,7 @@ static struct page * snd_pcm_mmap_control_nopage(struct vm_area_struct *area,
         struct page * page;
         
         if (substream == NULL)
-                return NOPAGE_OOM;
+                return NOPAGE_SIGBUS;
         runtime = substream->runtime;
         page = virt_to_page(runtime->control);
         get_page(page);
@@ -3131,18 +3131,18 @@ static struct page *snd_pcm_mmap_data_nopage(struct vm_area_struct *area,
         size_t dma_bytes;
         
         if (substream == NULL)
-                return NOPAGE_OOM;
+                return NOPAGE_SIGBUS;
         runtime = substream->runtime;
         offset = area->vm_pgoff << PAGE_SHIFT;
         offset += address - area->vm_start;
-        snd_assert((offset % PAGE_SIZE) == 0, return NOPAGE_OOM);
+        snd_assert((offset % PAGE_SIZE) == 0, return NOPAGE_SIGBUS);
         dma_bytes = PAGE_ALIGN(runtime->dma_bytes);
         if (offset > dma_bytes - PAGE_SIZE)
                 return NOPAGE_SIGBUS;
         if (substream->ops->page) {
                 page = substream->ops->page(substream, offset);
                 if (! page)
-                        return NOPAGE_OOM;
+                        return NOPAGE_OOM; /* XXX: is this really due to OOM? */
         } else {
                 vaddr = runtime->dma_area + offset;
                 page = virt_to_page(vaddr);
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index cc2b9ab7f4e5..a0588c21324a 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -5,20 +5,6 @@
 #
 # Prompt user for primary drivers.
 
-config OSS_OBSOLETE_DRIVER
-        bool "Obsolete OSS drivers"
-        depends on SOUND_PRIME
-        help
-          This option enables support for obsolete OSS 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 your soundcard is not properly supported
-          by ALSA.
-
-          If unsure, say N.
-
 config SOUND_BT878
         tristate "BT878 audio dma"
         depends on SOUND_PRIME && PCI
@@ -35,40 +21,6 @@ config SOUND_BT878
           To compile this driver as a module, choose M here: the module will
           be called btaudio.
 
-config SOUND_EMU10K1
-        tristate "Creative SBLive! (EMU10K1)"
-        depends on SOUND_PRIME && PCI && OSS_OBSOLETE_DRIVER
-        ---help---
-          Say Y or M if you have a PCI sound card using the EMU10K1 chipset,
-          such as the Creative SBLive!, SB PCI512 or Emu-APS.
-
-          For more information on this driver and the degree of support for
-          the different card models please check:
-
-                <http://sourceforge.net/projects/emu10k1/>
-
-          It is now possible to load dsp microcode patches into the EMU10K1
-          chip.  These patches are used to implement real time sound
-          processing effects which include for example: signal routing,
-          bass/treble control, AC3 passthrough, ...
-          Userspace tools to create new patches and load/unload them can be
-          found in the emu-tools package at the above URL.
-
-config MIDI_EMU10K1
-        bool "Creative SBLive! MIDI (EXPERIMENTAL)"
-        depends on SOUND_EMU10K1 && EXPERIMENTAL && ISA_DMA_API
-        help
-          Say Y if you want to be able to use the OSS /dev/sequencer
-          interface.  This code is still experimental.
-
-config SOUND_FUSION
-        tristate "Crystal SoundFusion (CS4280/461x)"
-        depends on SOUND_PRIME && PCI && OSS_OBSOLETE_DRIVER
-        help
-          This module drives the Crystal SoundFusion devices (CS4280/46xx
-          series) when wired as native sound drivers with AC97 codecs.  If
-          this driver does not work try the CS4232 driver.
-
 config SOUND_BCM_CS4297A
         tristate "Crystal Sound CS4297a (for Swarm)"
         depends on SOUND_PRIME && SIBYTE_SWARM
@@ -448,47 +400,6 @@ config SOUND_DMAP
 
           Say Y unless you have 16MB or more RAM or a PCI sound card.
 
-config SOUND_AD1816
-        tristate "AD1816(A) based cards (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && SOUND_OSS && OSS_OBSOLETE_DRIVER
-        help
-          Say M here if you have a sound card based on the Analog Devices
-          AD1816(A) chip.
-
-          If you compile the driver into the kernel, you have to add
-          "ad1816=<io>,<irq>,<dma>,<dma2>" to the kernel command line.
-
-config SOUND_AD1889
-        tristate "AD1889 based cards (AD1819 codec) (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && SOUND_OSS && PCI && OSS_OBSOLETE_DRIVER
-        help
-          Say M here if you have a sound card based on the Analog Devices
-          AD1889 chip.
-
-config SOUND_ADLIB
-        tristate "Adlib Cards"
-        depends on SOUND_OSS && OSS_OBSOLETE_DRIVER
-        help
-          Includes ASB 64 4D. Information on programming AdLib cards is
-          available at <http://www.itsnet.com/home/ldragon/Specs/adlib.html>.
-
-config SOUND_ACI_MIXER
-        tristate "ACI mixer (miroSOUND PCM1-pro/PCM12/PCM20)"
-        depends on SOUND_OSS && OSS_OBSOLETE_DRIVER
-        ---help---
-          ACI (Audio Command Interface) is a protocol used to communicate with
-          the microcontroller on some sound cards produced by miro and
-          Cardinal Technologies.  The main function of the ACI is to control
-          the mixer and to get a product identification.
-
-          This VoxWare ACI driver currently supports the ACI functions on the
-          miroSOUND PCM1-pro, PCM12 and PCM20 radio. On the PCM20 radio, ACI
-          also controls the radio tuner. This is supported in the video4linux
-          miropcm20 driver (say M or Y here and go back to "Multimedia
-          devices" -> "Radio Adapters").
-
-          This driver is also available as a module and will be called aci.
-
 config SOUND_CS4232
         tristate "Crystal CS4232 based (PnP) cards"
         depends on SOUND_OSS
@@ -594,18 +505,6 @@ config SOUND_MPU401
           If you compile the driver into the kernel, you have to add
           "mpu401=<io>,<irq>" to the kernel command line.
 
-config SOUND_NM256
-        tristate "NM256AV/NM256ZX audio support"
-        depends on SOUND_OSS && OSS_OBSOLETE_DRIVER
-        help
-          Say M here to include audio support for the NeoMagic 256AV/256ZX
-          chipsets. These are the audio chipsets found in the Sony
-          Z505S/SX/DX, some Sony F-series, and the Dell Latitude CPi and CPt
-          laptops. It includes support for an AC97-compatible mixer and an
-          apparently proprietary sound engine.
-
-          See <file:Documentation/sound/oss/NM256> for further information.
-
 config SOUND_PAS
         tristate "ProAudioSpectrum 16 support"
         depends on SOUND_OSS
@@ -714,20 +613,6 @@ config SOUND_YM3812
 
           If unsure, say Y.
 
-config SOUND_OPL3SA2
-        tristate "Yamaha OPL3-SA2 and SA3 based PnP cards"
-        depends on SOUND_OSS && OSS_OBSOLETE_DRIVER
-        help
-          Say Y or M if you have a card based on one of these Yamaha sound
-          chipsets or the "SAx", which is actually a SA3. Read
-          <file:Documentation/sound/oss/OPL3-SA2> for more information on
-          configuring these cards.
-
-          If you compile the driver into the kernel and do not also
-          configure in the optional ISA PnP support, you will have to add
-          "opl3sa2=<io>,<irq>,<dma>,<dma2>,<mssio>,<mpuio>" to the kernel
-          command line.
-
 config SOUND_UART6850
         tristate "6850 UART support"
         depends on SOUND_OSS
diff --git a/sound/oss/btaudio.c b/sound/oss/btaudio.c
index 6ad384114239..ad7210a00dc0 100644
--- a/sound/oss/btaudio.c
+++ b/sound/oss/btaudio.c
@@ -1020,6 +1020,7 @@ static int __devinit btaudio_probe(struct pci_dev *pci_dev,
  fail2:
         free_irq(bta->irq,bta); 
  fail1:
+        iounmap(bta->mmio);
         kfree(bta);
  fail0:
         release_mem_region(pci_resource_start(pci_dev,0),
@@ -1051,6 +1052,7 @@ static void __devexit btaudio_remove(struct pci_dev *pci_dev)
         free_irq(bta->irq,bta);
         release_mem_region(pci_resource_start(pci_dev,0),
                            pci_resource_len(pci_dev,0));
+        iounmap(bta->mmio);
 
         /* remove from linked list */
         if (bta == btaudios) {
diff --git a/sound/oss/emu10k1/audio.c b/sound/oss/emu10k1/audio.c
index 86dd23974e05..49f902f35c28 100644
--- a/sound/oss/emu10k1/audio.c
+++ b/sound/oss/emu10k1/audio.c
@@ -111,9 +111,15 @@ static ssize_t emu10k1_audio_read(struct file *file, char __user *buffer, size_t
 
                 if ((bytestocopy >= wiinst->buffer.fragment_size)
                     || (bytestocopy >= count)) {
+                        int rc;
+
                         bytestocopy = min_t(u32, bytestocopy, count);
 
-                        emu10k1_wavein_xferdata(wiinst, (u8 __user *)buffer, &bytestocopy);
+                        rc = emu10k1_wavein_xferdata(wiinst,
+                                                     (u8 __user *)buffer,
+                                                     &bytestocopy);
+                        if (rc)
+                                return rc;
 
                         count -= bytestocopy;
                         buffer += bytestocopy;
diff --git a/sound/oss/emu10k1/cardwi.c b/sound/oss/emu10k1/cardwi.c
index 8bbf44b881b4..060d1be94d33 100644
--- a/sound/oss/emu10k1/cardwi.c
+++ b/sound/oss/emu10k1/cardwi.c
@@ -304,11 +304,12 @@ void emu10k1_wavein_getxfersize(struct wiinst *wiinst, u32 * size)
         }
 }
 
-static void copy_block(u8 __user *dst, u8 * src, u32 str, u32 len, u8 cov)
+static int copy_block(u8 __user *dst, u8 * src, u32 str, u32 len, u8 cov)
 {
-        if (cov == 1)
-                __copy_to_user(dst, src + str, len);
-        else {
+        if (cov == 1) {
+                if (__copy_to_user(dst, src + str, len))
+                        return -EFAULT;
+        } else {
                 u8 byte;
                 u32 i;
 
@@ -316,22 +317,26 @@ static void copy_block(u8 __user *dst, u8 * src, u32 str, u32 len, u8 cov)
 
                 for (i = 0; i < len; i++) {
                         byte = src[2 * i] ^ 0x80;
-                        __copy_to_user(dst + i, &byte, 1);
+                        if (__copy_to_user(dst + i, &byte, 1))
+                                return -EFAULT;
                 }
         }
+
+        return 0;
 }
 
-void emu10k1_wavein_xferdata(struct wiinst *wiinst, u8 __user *data, u32 * size)
+int emu10k1_wavein_xferdata(struct wiinst *wiinst, u8 __user *data, u32 * size)
 {
         struct wavein_buffer *buffer = &wiinst->buffer;
         u32 sizetocopy, sizetocopy_now, start;
         unsigned long flags;
+        int ret;
 
         sizetocopy = min_t(u32, buffer->size, *size);
         *size = sizetocopy;
 
         if (!sizetocopy)
-                return;
+                return 0;
 
         spin_lock_irqsave(&wiinst->lock, flags);
         start = buffer->pos;
@@ -345,11 +350,17 @@ void emu10k1_wavein_xferdata(struct wiinst *wiinst, u8 __user *data, u32 * size)
         if (sizetocopy > sizetocopy_now) {
                 sizetocopy -= sizetocopy_now;
 
-                copy_block(data, buffer->addr, start, sizetocopy_now, buffer->cov);
-                copy_block(data + sizetocopy_now, buffer->addr, 0, sizetocopy, buffer->cov);
+                ret = copy_block(data, buffer->addr, start, sizetocopy_now,
+                                 buffer->cov);
+                if (ret == 0)
+                        ret = copy_block(data + sizetocopy_now, buffer->addr, 0,
+                                         sizetocopy, buffer->cov);
         } else {
-                copy_block(data, buffer->addr, start, sizetocopy, buffer->cov);
+                ret = copy_block(data, buffer->addr, start, sizetocopy,
+                                 buffer->cov);
         }
+
+        return ret;
 }
 
 void emu10k1_wavein_update(struct emu10k1_card *card, struct wiinst *wiinst)
diff --git a/sound/oss/emu10k1/cardwi.h b/sound/oss/emu10k1/cardwi.h
index 15cfb9b35596..e82029b46ad1 100644
--- a/sound/oss/emu10k1/cardwi.h
+++ b/sound/oss/emu10k1/cardwi.h
@@ -83,7 +83,7 @@ void emu10k1_wavein_close(struct emu10k1_wavedevice *);
 void emu10k1_wavein_start(struct emu10k1_wavedevice *);
 void emu10k1_wavein_stop(struct emu10k1_wavedevice *);
 void emu10k1_wavein_getxfersize(struct wiinst *, u32 *);
-void emu10k1_wavein_xferdata(struct wiinst *, u8 __user *, u32 *);
+int emu10k1_wavein_xferdata(struct wiinst *, u8 __user *, u32 *);
 int emu10k1_wavein_setformat(struct emu10k1_wavedevice *, struct wave_format *);
 void emu10k1_wavein_update(struct emu10k1_card *, struct wiinst *);
 
diff --git a/sound/oss/emu10k1/passthrough.c b/sound/oss/emu10k1/passthrough.c
index 4e3baca7d41f..6d21d4368dec 100644
--- a/sound/oss/emu10k1/passthrough.c
+++ b/sound/oss/emu10k1/passthrough.c
@@ -162,12 +162,15 @@ ssize_t emu10k1_pt_write(struct file *file, const char __user *buffer, size_t co
 
                 DPD(3, "prepend size %d, prepending %d bytes\n", pt->prepend_size, needed);
                 if (count < needed) {
-                        copy_from_user(pt->buf + pt->prepend_size, buffer, count);
+                        if (copy_from_user(pt->buf + pt->prepend_size,
+                                           buffer, count))
+                                return -EFAULT;
                         pt->prepend_size += count;
                         DPD(3, "prepend size now %d\n", pt->prepend_size);
                         return count;
                 }
-                copy_from_user(pt->buf + pt->prepend_size, buffer, needed);
+                if (copy_from_user(pt->buf + pt->prepend_size, buffer, needed))
+                        return -EFAULT;
                 r = pt_putblock(wave_dev, (u16 *) pt->buf, nonblock);
                 if (r)
                         return r;
@@ -178,7 +181,8 @@ ssize_t emu10k1_pt_write(struct file *file, const char __user *buffer, size_t co
         blocks_copied = 0;
         while (blocks > 0) {
                 u16 __user *bufptr = (u16 __user *) buffer + (bytes_copied/2);
-                copy_from_user(pt->buf, bufptr, PT_BLOCKSIZE);
+                if (copy_from_user(pt->buf, bufptr, PT_BLOCKSIZE))
+                        return -EFAULT;
                 r = pt_putblock(wave_dev, (u16 *)pt->buf, nonblock);
                 if (r) {
                         if (bytes_copied)
@@ -193,7 +197,8 @@ ssize_t emu10k1_pt_write(struct file *file, const char __user *buffer, size_t co
         i = count - bytes_copied;
         if (i) {
                 pt->prepend_size = i;
-                copy_from_user(pt->buf, buffer + bytes_copied, i);
+                if (copy_from_user(pt->buf, buffer + bytes_copied, i))
+                        return -EFAULT;
                 bytes_copied += i;
                 DPD(3, "filling prepend buffer with %d bytes", i);
         }
diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c
index 17837d4b5ed3..c96cc8c68b3b 100644
--- a/sound/oss/via82cxxx_audio.c
+++ b/sound/oss/via82cxxx_audio.c
@@ -2120,8 +2120,8 @@ static struct page * via_mm_nopage (struct vm_area_struct * vma,
                 return NOPAGE_SIGBUS; /* Disallow mremap */
         }
         if (!card) {
-                DPRINTK ("EXIT, returning NOPAGE_OOM\n");
-                return NOPAGE_OOM;      /* Nothing allocated */
+                DPRINTK ("EXIT, returning NOPAGE_SIGBUS\n");
+                return NOPAGE_SIGBUS;   /* Nothing allocated */
         }
 
         pgoff = vma->vm_pgoff + ((address - vma->vm_start) >> PAGE_SHIFT);
diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c
index 4b52d18dcd53..b76b3dd9df25 100644
--- a/sound/usb/usx2y/usX2Yhwdep.c
+++ b/sound/usb/usx2y/usX2Yhwdep.c
@@ -48,7 +48,7 @@ static struct page * snd_us428ctls_vm_nopage(struct vm_area_struct *area, unsign
         
         offset = area->vm_pgoff << PAGE_SHIFT;
         offset += address - area->vm_start;
-        snd_assert((offset % PAGE_SIZE) == 0, return NOPAGE_OOM);
+        snd_assert((offset % PAGE_SIZE) == 0, return NOPAGE_SIGBUS);
         vaddr = (char*)((struct usX2Ydev *)area->vm_private_data)->us428ctls_sharedmem + offset;
         page = virt_to_page(vaddr);
         get_page(page);