diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /drivers/char/radio-cadet.c | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'drivers/char/radio-cadet.c')
| -rw-r--r-- | drivers/char/radio-cadet.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/char/radio-cadet.c b/drivers/char/radio-cadet.c index cfca71f7f..239a611b2 100644 --- a/drivers/char/radio-cadet.c +++ b/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 @@ void cadet_handler(unsigned long data) 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 @@ static struct video_device cadet_radio= NULL }; -__initfunc(int cadet_init(struct video_init *v)) +int __init cadet_init(struct video_init *v) { #ifndef MODULE if(cadet_probe()<0) { |