diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
| commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
| tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /drivers/sgi | |
| parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) | |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'drivers/sgi')
| -rw-r--r-- | drivers/sgi/char/graphics.c | 3 | ||||
| -rw-r--r-- | drivers/sgi/char/shmiq.c | 10 | ||||
| -rw-r--r-- | drivers/sgi/char/streamable.c | 5 | ||||
| -rw-r--r-- | drivers/sgi/char/usema.c | 1 |
4 files changed, 13 insertions, 6 deletions
diff --git a/drivers/sgi/char/graphics.c b/drivers/sgi/char/graphics.c index 18ffab8a3..12f86d6dd 100644 --- a/drivers/sgi/char/graphics.c +++ b/drivers/sgi/char/graphics.c @@ -1,4 +1,4 @@ -/* $Id: graphics.c,v 1.5 1998/08/19 21:55:29 ralf Exp $ +/* $Id: graphics.c,v 1.13 1998/08/25 09:18:57 ralf Exp $ * * gfx.c: support for SGI's /dev/graphics, /dev/opengl * @@ -279,6 +279,7 @@ struct file_operations sgi_graphics_fops = { sgi_graphics_ioctl, /* ioctl */ sgi_graphics_mmap, /* mmap */ sgi_graphics_open, /* open */ + NULL, /* flush */ sgi_graphics_close, /* release */ NULL, /* fsync */ NULL, /* check_media_change */ diff --git a/drivers/sgi/char/shmiq.c b/drivers/sgi/char/shmiq.c index b79308c58..07edffb5b 100644 --- a/drivers/sgi/char/shmiq.c +++ b/drivers/sgi/char/shmiq.c @@ -1,4 +1,5 @@ -/* +/* $Id: shmiq.c,v 1.8 1998/08/29 20:40:04 ralf Exp $ + * * shmiq.c: shared memory input queue driver * written 1997 Miguel de Icaza (miguel@nuclecu.unam.mx) * @@ -395,12 +396,12 @@ shmiq_qcntl_open (struct inode *inode, struct file *filp) } static int -shmiq_qcntl_fasync (struct file *file, int on) +shmiq_qcntl_fasync (int fd, struct file *file, int on) { int retval; int minor = MINOR (file->f_dentry->d_inode->i_rdev); - retval = fasync_helper (file, on, &shmiqs [minor].fasync); + retval = fasync_helper (fd, file, on, &shmiqs [minor].fasync); if (retval < 0) return retval; return 0; @@ -423,7 +424,7 @@ shmiq_qcntl_close (struct inode *inode, struct file *filp) return -EINVAL; lock_kernel (); - shmiq_qcntl_fasync (filp, 0); + shmiq_qcntl_fasync (-1, filp, 0); shmiqs [minor].opened = 0; shmiqs [minor].mapped = 0; shmiqs [minor].events = 0; @@ -446,6 +447,7 @@ file_operations shmiq_fops = shmiq_qcntl_ioctl, /* ioctl */ shmiq_qcntl_mmap, /* mmap */ shmiq_qcntl_open, /* open */ + NULL, /* flush */ shmiq_qcntl_close, /* close */ NULL, /* fsync */ shmiq_qcntl_fasync, /* fasync */ diff --git a/drivers/sgi/char/streamable.c b/drivers/sgi/char/streamable.c index 30603fade..913ada22d 100644 --- a/drivers/sgi/char/streamable.c +++ b/drivers/sgi/char/streamable.c @@ -1,4 +1,4 @@ -/* $Id: streamable.c,v 1.2 1998/08/19 21:55:31 ralf Exp $ +/* $Id: streamable.c,v 1.8 1998/08/25 09:18:59 ralf Exp $ * * streamable.c: streamable devices. /dev/gfx * (C) 1997 Miguel de Icaza (miguel@nuclecu.unam.mx) @@ -80,6 +80,7 @@ struct file_operations sgi_gfx_fops = { sgi_gfx_ioctl, /* ioctl */ NULL, /* mmap */ sgi_gfx_open, /* open */ + NULL, /* flush */ sgi_gfx_close, /* release */ NULL, /* fsync */ NULL, /* check_media_change */ @@ -200,6 +201,7 @@ struct file_operations sgi_keyb_fops = { sgi_keyb_ioctl, /* ioctl */ NULL, /* mmap */ sgi_keyb_open, /* open */ + NULL, /* flush */ NULL, /* release */ NULL, /* fsync */ NULL, /* check_media_change */ @@ -340,6 +342,7 @@ struct file_operations sgi_mouse_fops = { sgi_mouse_ioctl, /* ioctl */ NULL, /* mmap */ sgi_mouse_open, /* open */ + NULL, /* flush */ sgi_mouse_close, /* release */ NULL, /* fsync */ NULL, /* check_media_change */ diff --git a/drivers/sgi/char/usema.c b/drivers/sgi/char/usema.c index 880c93c31..db7c98396 100644 --- a/drivers/sgi/char/usema.c +++ b/drivers/sgi/char/usema.c @@ -175,6 +175,7 @@ struct file_operations sgi_usemaclone_fops = { sgi_usemaclone_ioctl, /* ioctl */ NULL, /* mmap */ sgi_usemaclone_open, /* open */ + NULL, /* flush */ sgi_usemaclone_release, /* release */ NULL, /* fsync */ NULL, /* check_media_change */ |