vserver 1.9.3

[linux-2.6.git] / sound / oss / cmpci.c

diff --git a/sound/oss/cmpci.c b/sound/oss/cmpci.c
index a7d067c..a862958 100644 (file)
--- a/sound/oss/cmpci.c
+++ b/sound/oss/cmpci.c
@@ -1852,7 +1852,7 @@ static int cm_open_mixdev(struct inode *inode, struct file *file)
        }
                VALIDATE_STATE(s);
        file->private_data = s;
-       return 0;
+       return nonseekable_open(inode, file);
 }
 
 static int cm_release_mixdev(struct inode *inode, struct file *file)
@@ -1926,8 +1926,6 @@ static ssize_t cm_read(struct file *file, char __user *buffer, size_t count, lof
        int cnt;
 
        VALIDATE_STATE(s);
-       if (ppos != &file->f_pos)
-               return -ESPIPE;
        if (s->dma_adc.mapped)
                return -ENXIO;
        if (!s->dma_adc.ready && (ret = prog_dmabuf(s, 1)))
@@ -2028,8 +2026,6 @@ static ssize_t cm_write(struct file *file, const char __user *buffer, size_t cou
        int cnt;
 
        VALIDATE_STATE(s);
-       if (ppos != &file->f_pos)
-               return -ESPIPE;
        if (s->dma_dac.mapped)
                return -ENXIO;
        if (!s->dma_dac.ready && (ret = prog_dmabuf(s, 0)))
@@ -2878,7 +2874,7 @@ static int cm_open(struct inode *inode, struct file *file)
        set_fmt(s, fmtm, fmts);
        s->open_mode |= file->f_mode & (FMODE_READ | FMODE_WRITE);
        up(&s->open_sem);
-       return 0;
+       return nonseekable_open(inode, file);
 }
 
 static int cm_release(struct inode *inode, struct file *file)
@@ -3004,6 +3000,8 @@ static int __devinit cm_probe(struct pci_dev *pcidev, const struct pci_device_id
        mm_segment_t fs;
        int i, val, ret;
        unsigned char reg_mask;
+       int timeout;
+       struct resource *ports;
        struct {
                unsigned short  deviceid;
                char            *devicename;
@@ -3188,54 +3186,55 @@ static int __devinit cm_probe(struct pci_dev *pcidev, const struct pci_device_id
        }
 #endif
 #ifdef CONFIG_SOUND_CMPCI_MIDI
+       switch (s->iomidi) {
+           case 0x330:
+               reg_mask = 0;
+               break;
+           case 0x320:
+               reg_mask = 0x20;
+               break;
+           case 0x310:
+               reg_mask = 0x40;
+               break;
+           case 0x300:
+               reg_mask = 0x60;
+               break;
+           default:
+               s->iomidi = 0;
+               goto skip_mpu;
+       }
+       ports = request_region(s->iomidi, 2, "mpu401");
+       if (!ports)
+               goto skip_mpu;
        /* disable MPU-401 */
        maskb(s->iobase + CODEC_CMI_FUNCTRL1, ~0x04, 0);
        s->mpu_data.name = "cmpci mpu";
        s->mpu_data.io_base = s->iomidi;
        s->mpu_data.irq = -s->irq;      // tell mpu401 to share irq
-       if (probe_mpu401(&s->mpu_data))
+       if (probe_mpu401(&s->mpu_data, ports)) {
+               release_region(s->iomidi, 2);
                s->iomidi = 0;
-       if (s->iomidi) {
-               /* set IO based at 0x330 */
-               switch (s->iomidi) {
-                   case 0x330:
-                       reg_mask = 0;
-                       break;
-                   case 0x320:
-                       reg_mask = 0x20;
-                       break;
-                   case 0x310:
-                       reg_mask = 0x40;
-                       break;
-                   case 0x300:
-                       reg_mask = 0x60;
-                       break;
-                   default:
-                       s->iomidi = 0;
+               goto skip_mpu;
+       }
+       maskb(s->iobase + CODEC_CMI_LEGACY_CTRL + 3, ~0x60, reg_mask);
+       /* enable MPU-401 */
+       maskb(s->iobase + CODEC_CMI_FUNCTRL1, ~0, 0x04);
+       /* clear all previously received interrupt */
+       for (timeout = 900000; timeout > 0; timeout--) {
+               if ((inb(s->iomidi + 1) && 0x80) == 0)
+                       inb(s->iomidi);
+               else
                        break;
-               }
-               maskb(s->iobase + CODEC_CMI_LEGACY_CTRL + 3, ~0x60, reg_mask);
-               /* enable MPU-401 */
-               if (s->iomidi) {
-                       int timeout;
-
-                       maskb(s->iobase + CODEC_CMI_FUNCTRL1, ~0, 0x04);
-                       /* clear all previously received interrupt */
-                       for (timeout = 900000; timeout > 0; timeout--) {
-                               if ((inb(s->iomidi + 1) && 0x80) == 0)
-                                       inb(s->iomidi);
-                               else
-                                       break;
-                       }
-                       if (!probe_mpu401(&s->mpu_data)) {
-                               s->iomidi = 0;
-                               maskb(s->iobase + CODEC_CMI_FUNCTRL1, ~0, 0x04);
-                       } else {
-                               attach_mpu401(&s->mpu_data, THIS_MODULE);
-                               s->midi_devc = s->mpu_data.slots[1];
-                       }
-               }
        }
+       if (!probe_mpu401(&s->mpu_data, ports)) {
+               release_region(s->iomidi, 2);
+               s->iomidi = 0;
+               maskb(s->iobase + CODEC_CMI_FUNCTRL1, ~0, 0x04);
+       } else {
+               attach_mpu401(&s->mpu_data, THIS_MODULE);
+               s->midi_devc = s->mpu_data.slots[1];
+       }
+skip_mpu:
 #endif
 #ifdef CONFIG_SOUND_CMPCI_JOYSTICK
        /* enable joystick */
@@ -3280,7 +3279,7 @@ MODULE_AUTHOR("ChenLi Tien, cltien@cmedia.com.tw");
 MODULE_DESCRIPTION("CM8x38 Audio Driver");
 MODULE_LICENSE("GPL");
 
-static void __devinit cm_remove(struct pci_dev *dev)
+static void __devexit cm_remove(struct pci_dev *dev)
 {
        struct cm_state *s = pci_get_drvdata(dev);
 
@@ -3337,7 +3336,7 @@ static struct pci_driver cm_driver = {
        .name    = "cmpci",
        .id_table = id_table,
        .probe   = cm_probe,
-       .remove  = cm_remove
+       .remove  = __devexit_p(cm_remove)
 };
 
 static int __init init_cmpci(void)