]> git.neil.brown.name Git - history.git/commitdiff
[SOUND]: ioctl32/{ioctl32,rawmidi32,seq32,timer32}.c needs linux/fs.h
authorDavid S. Miller <davem@nuts.ninka.net>
Fri, 20 Dec 2002 11:35:39 +0000 (03:35 -0800)
committerDavid S. Miller <davem@nuts.ninka.net>
Fri, 20 Dec 2002 11:35:39 +0000 (03:35 -0800)
sound/core/ioctl32/ioctl32.c
sound/core/ioctl32/rawmidi32.c
sound/core/ioctl32/seq32.c
sound/core/ioctl32/timer32.c

index fd37aab6d80dc9ecc0cc400cba561ed46b50ef58..c8183837f8b0469c5352373a7e1daf7d0eadfdd0 100644 (file)
@@ -24,6 +24,7 @@
 #include <linux/init.h>
 #include <linux/time.h>
 #include <linux/slab.h>
+#include <linux/fs.h>
 #include <linux/init.h>
 #include <sound/core.h>
 #include <sound/control.h>
@@ -248,17 +249,14 @@ static int get_ctl_type(struct file *file, snd_ctl_elem_id_t *id)
 
        ctl = snd_magic_cast(snd_ctl_file_t, file->private_data, return -ENXIO);
 
-       read_lock(&ctl->card->control_rwlock);
        kctl = snd_ctl_find_id(ctl->card, id);
-       if (! kctl) {
-               read_unlock(&ctl->card->control_rwlock);
+       if (! kctl)
                return -ENXIO;
-       }
+
        info.id = *id;
        err = kctl->info(kctl, &info);
        if (err >= 0)
                err = info.type;
-       read_unlock(&ctl->card->control_rwlock);
        return err;
 }
 
index f75a53d4e8af11262bae61ef52d97a2f9e0218fa..31b3319fba7a3450072cc871edb145a2e8d0d1ab 100644 (file)
@@ -20,6 +20,7 @@
 
 #include <sound/driver.h>
 #include <linux/time.h>
+#include <linux/fs.h>
 #include <sound/core.h>
 #include <sound/rawmidi.h>
 #include <asm/uaccess.h>
index e7a19f6c4ce681794cbb502e01788fb54a9c3211..1d396554b7ba45fedb450d978816ae99b1eda7c4 100644 (file)
@@ -20,6 +20,7 @@
 
 #include <sound/driver.h>
 #include <linux/time.h>
+#include <linux/fs.h>
 #include <sound/core.h>
 #include <sound/timer.h>
 #include <asm/uaccess.h>
index b0167274aca1834c8ab5271d0e5b461ce2614559..1672e0342ec42bdddc848e4161c979a34bbb115a 100644 (file)
@@ -20,6 +20,7 @@
 
 #include <sound/driver.h>
 #include <linux/time.h>
+#include <linux/fs.h>
 #include <sound/core.h>
 #include <sound/timer.h>
 #include <asm/uaccess.h>