patch-2.4.9 linux/drivers/sound/maestro3.c

• Lines: 41
• Date: Sun Aug 12 10:38:48 2001
• Orig file: v2.4.8/linux/drivers/sound/maestro3.c
• Orig date: Tue Jul 3 17:08:21 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/sound/maestro3.c linux/drivers/sound/maestro3.c
@@ -130,7 +130,7 @@
 #include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/sound.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/soundcard.h>
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
@@ -1280,13 +1280,6 @@
 
 /* --------------------------------------------------------------------- */
 
-static loff_t m3_llseek(struct file *file, loff_t offset, int origin)
-{
-    return -ESPIPE;
-}
-
-/* --------------------------------------------------------------------- */
-
 static int drain_dac(struct m3_state *s, int nonblock)
 {
     DECLARE_WAITQUEUE(wait,current);
@@ -2180,7 +2173,7 @@
 }
 
 static struct file_operations m3_mixer_fops = {
-    llseek:         m3_llseek,
+    llseek:         no_llseek,
     ioctl:          m3_ioctl_mixdev,
     open:           m3_open_mixdev,
     release:        m3_release_mixdev,
@@ -2553,7 +2546,7 @@
 }
 
 static struct file_operations m3_audio_fops = {
-    llseek:     &m3_llseek,
+    llseek:     &no_llseek,
     read:       &m3_read,
     write:      &m3_write,
     poll:       &m3_poll,