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/sbpcd.c | |
| parent | 7206675c40394c78a90e74812bbdbf8cf3cca1be (diff) | |
Import of Linux/MIPS 2.1.36
Diffstat (limited to 'drivers/cdrom/sbpcd.c')
| -rw-r--r-- | drivers/cdrom/sbpcd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c index df4341ffa..6d27b2248 100644 --- a/drivers/cdrom/sbpcd.c +++ b/drivers/cdrom/sbpcd.c @@ -442,6 +442,7 @@ static int sbpcd[] = #else static int sbpcd[] = {CDROM_PORT, SBPRO}; /* probe with user's setup only */ #endif +MODULE_PARM(sbpcd, "2i"); #define NUM_PROBE (sizeof(sbpcd) / sizeof(int)) @@ -5199,7 +5200,7 @@ static int sbpcd_open(struct inode *ip, struct file *fp) /* * On close, we flush all sbp blocks from the buffer cache. */ -static void sbpcd_release(struct inode * ip, struct file * file) +static int sbpcd_release(struct inode * ip, struct file * file) { int i; @@ -5207,7 +5208,7 @@ static void sbpcd_release(struct inode * ip, struct file * file) if ((i<0) || (i>=NR_SBPCD) || (D_S[i].drv_id==-1)) { msg(DBG_INF, "release: bad device: %04X\n", ip->i_rdev); - return; + return 0; } down(&ioctl_read_sem); switch_drive(i); @@ -5235,6 +5236,7 @@ static void sbpcd_release(struct inode * ip, struct file * file) } } up(&ioctl_read_sem); + return 0; } /*==========================================================================*/ /* @@ -5246,7 +5248,7 @@ static struct file_operations sbpcd_fops = block_read, /* read - general block-dev read */ block_write, /* write - general block-dev write */ NULL, /* readdir - bad */ - NULL, /* select */ + NULL, /* poll */ sbpcd_ioctl, /* ioctl */ NULL, /* mmap */ sbpcd_open, /* open */ |