diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
| commit | 116674acc97ba75a720329996877077d988443a2 (patch) | |
| tree | 6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /drivers/ide/ide-cs.c | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/ide/ide-cs.c')
| -rw-r--r-- | drivers/ide/ide-cs.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c index bf4350f73..4a199ca71 100644 --- a/drivers/ide/ide-cs.c +++ b/drivers/ide/ide-cs.c @@ -19,7 +19,7 @@ are Copyright (C) 1999 David A. Hinds. All Rights Reserved. Alternatively, the contents of this file may be used under the - terms of the GNU Public License version 2 (the "GPL"), in which + terms of the GNU General Public License version 2 (the "GPL"), in which case the provisions of the GPL are applicable instead of the above. If you wish to allow the use of your version of this file only under the terms of the GPL and not to allow others to use @@ -36,7 +36,7 @@ #include <linux/init.h> #include <linux/sched.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/ioport.h> @@ -95,7 +95,7 @@ static void ide_release(u_long arg); static int ide_event(event_t event, int priority, event_callback_args_t *args); -static dev_info_t dev_info = "ide_cs"; +static dev_info_t dev_info = "ide-cs"; static dev_link_t *ide_attach(void); static void ide_detach(dev_link_t *); @@ -387,6 +387,11 @@ void ide_release(u_long arg) ide_unregister(info->hd); MOD_DEC_USE_COUNT; } + + request_region(link->io.BasePort1, link->io.NumPorts1,"ide-cs"); + if (link->io.NumPorts2) + request_region(link->io.BasePort2, link->io.NumPorts2,"ide-cs"); + info->ndev = 0; link->dev = NULL; |