X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Foss%2Fforte.c;h=67b2bbb2aa101f0c5867e75cd272b58479e3152d;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=c7e23fc3c69daa1d812d87a77061869866918e65;hpb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;p=linux-2.6.git

diff --git a/sound/oss/forte.c b/sound/oss/forte.c
index c7e23fc3c..67b2bbb2a 100644
--- a/sound/oss/forte.c
+++ b/sound/oss/forte.c
@@ -45,7 +45,6 @@
 #include <linux/proc_fs.h>
 
 #include <asm/uaccess.h>
-#include <asm/hardirq.h>
 #include <asm/io.h>
 
 #define DRIVER_NAME	"forte"
@@ -1265,7 +1264,7 @@ forte_dsp_open (struct inode *inode, struct file *file)
 	if (file->f_mode & FMODE_READ)
 		forte_channel_init (forte, &forte->rec);
 
-	return 0;
+	return nonseekable_open(inode, file);
 }
 
 
@@ -1438,9 +1437,6 @@ forte_dsp_write (struct file *file, const char __user *buffer, size_t bytes,
 	unsigned int i = bytes, sz = 0;
 	unsigned long flags;
 
-	if (ppos != &file->f_pos)
-		return -ESPIPE;
-
 	if (!access_ok (VERIFY_READ, buffer, bytes))
 		return -EFAULT;
 
@@ -1546,9 +1542,6 @@ forte_dsp_read (struct file *file, char __user *buffer, size_t bytes,
 	unsigned int i = bytes, sz;
 	unsigned long flags;
 
-	if (ppos != &file->f_pos)
-		return -ESPIPE;
-
 	if (!access_ok (VERIFY_WRITE, buffer, bytes))
 		return -EFAULT;
 
@@ -1847,15 +1840,15 @@ forte_proc_read (char *page, char **start, off_t off, int count,
 static int __init 
 forte_proc_init (void)
 {
-	if (!proc_mkdir ("driver/forte", 0))
+	if (!proc_mkdir ("driver/forte", NULL))
 		return -EIO;
 
-	if (!create_proc_read_entry ("driver/forte/chip", 0, 0, forte_proc_read, forte)) {
+	if (!create_proc_read_entry ("driver/forte/chip", 0, NULL, forte_proc_read, forte)) {
 		remove_proc_entry ("driver/forte", NULL);
 		return -EIO;
 	}
 
-	if (!create_proc_read_entry("driver/forte/ac97", 0, 0, ac97_read_proc, forte->ac97)) {
+	if (!create_proc_read_entry("driver/forte/ac97", 0, NULL, ac97_read_proc, forte->ac97)) {
 		remove_proc_entry ("driver/forte/chip", NULL);
 		remove_proc_entry ("driver/forte", NULL);
 		return -EIO;