diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
---|---|---|
committer | <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
commit | 19c9bba94152148523ba0f7ef7cffe3d45656b11 (patch) | |
tree | 40b1cb534496a7f1ca0f5c314a523c69f1fee464 /drivers/cdrom/gscd.c | |
parent | 7206675c40394c78a90e74812bbdbf8cf3cca1be (diff) |
Import of Linux/MIPS 2.1.36
Diffstat (limited to 'drivers/cdrom/gscd.c')
-rw-r--r-- | drivers/cdrom/gscd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/cdrom/gscd.c b/drivers/cdrom/gscd.c index 749544371..c9ad14748 100644 --- a/drivers/cdrom/gscd.c +++ b/drivers/cdrom/gscd.c @@ -71,6 +71,7 @@ static int gscdPresent = 0; static unsigned char gscd_buf[2048]; /* buffer for block size conversion */ static int gscd_bn = -1; static short gscd_port = GSCD_BASE_ADDR; +MODULE_PARM(gscd, "h"); /* Kommt spaeter vielleicht noch mal dran ... * static struct wait_queue *gscd_waitq = NULL; @@ -86,7 +87,7 @@ static void gscd_bin2bcd (unsigned char *p); static void do_gscd_request (void); static int gscd_ioctl (struct inode *, struct file *, unsigned int, unsigned long); static int gscd_open (struct inode *, struct file *); -static void gscd_release (struct inode *, struct file *); +static int gscd_release (struct inode *, struct file *); static int check_gscd_med_chg (kdev_t); /* GoldStar Funktionen */ @@ -154,7 +155,7 @@ static struct file_operations gscd_fops = { block_read, /* read - general block-dev read */ block_write, /* write - general block-dev write */ NULL, /* readdir - bad */ - NULL, /* select */ + NULL, /* poll */ gscd_ioctl, /* ioctl */ NULL, /* mmap */ gscd_open, /* open */ @@ -393,7 +394,7 @@ printk ( "GSCD: open\n" ); * On close, we flush all gscd blocks from the buffer cache. */ -static void gscd_release (struct inode * inode, struct file * file) +static int gscd_release (struct inode * inode, struct file * file) { #ifdef GSCD_DEBUG @@ -405,6 +406,7 @@ printk ( "GSCD: release\n" ); invalidate_buffers(inode -> i_rdev); MOD_DEC_USE_COUNT; + return 0; } |