patch-2.3.10 linux/drivers/char/radio-cadet.c

• Lines: 38
• Date: Mon Jul 5 20:07:02 1999
• Orig file: v2.3.9/linux/drivers/char/radio-cadet.c
• Orig date: Mon Jun 7 16:17:59 1999

diff -u --recursive --new-file v2.3.9/linux/drivers/char/radio-cadet.c linux/drivers/char/radio-cadet.c
@@ -1,7 +1,7 @@
-/* cadet.c - A video4linux driver for the ADS Cadet AM/FM Radio Card 
+/* radio-cadet.c - A video4linux driver for the ADS Cadet AM/FM Radio Card 
  *
  * by Fred Gleason <fredg@wava.com>
- * Version 0.3.2
+ * Version 0.3.3
  *
  * (Loosely) based on code for the Aztech radio card by
  *
@@ -346,17 +346,13 @@
 static long cadet_read(struct video_device *v,char *buf,unsigned long count,
 		       int nonblock)
 {
-        int i=0,c;
+        int i=0;
 	unsigned char readbuf[RDS_BUFFER];
 
         if(rdsstat==0) {
 	        cadet_lock++;
 	        rdsstat=1;
 		outb(0x80,io);        /* Select RDS fifo */
-		c=3*(inb(io)&0x03);
-		for(i=0;i<c;i++) {    /* Flush the fifo */
-		        inb(io+1);
-		}
 		cadet_lock--;
 		init_timer(&readtimer);
 		readtimer.function=cadet_handler;
@@ -546,7 +542,7 @@
 	NULL
 };
 
-__initfunc(int cadet_init(struct video_init *v))
+int __init cadet_init(struct video_init *v)
 {
 #ifndef MODULE        
         if(cadet_probe()<0) {