summaryrefslogtreecommitdiffstats
path: root/drivers/char/sx.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-11-28 03:58:46 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-11-28 03:58:46 +0000
commitb63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch)
tree0a343ce219e2b8b38a5d702d66032c57b83d9720 /drivers/char/sx.c
parenta9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff)
Merge with 2.4.0-test11.
Diffstat (limited to 'drivers/char/sx.c')
-rw-r--r--drivers/char/sx.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index 3dd5811d9..902642151 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -1756,16 +1756,12 @@ static int sx_fw_ioctl (struct inode *inode, struct file *filp,
sx_initialized++;
break;
case SXIO_SETDEBUG:
+ case SXIO_SETGSDEBUG:
sx_debug = arg;
break;
case SXIO_GETDEBUG:
- rc = sx_debug;
- break;
- case SXIO_SETGSDEBUG:
- gs_debug = arg;
- break;
case SXIO_GETGSDEBUG:
- rc = gs_debug;
+ rc = sx_debug;
break;
case SXIO_GETNPORTS:
rc = sx_nports;