git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
scsi
/
g_NCR5380.c
diff --git
a/drivers/scsi/g_NCR5380.c
b/drivers/scsi/g_NCR5380.c
index
f289be2
..
9c1f8cc
100644
(file)
--- a/
drivers/scsi/g_NCR5380.c
+++ b/
drivers/scsi/g_NCR5380.c
@@
-107,7
+107,7
@@
#include <linux/sched.h>
#include <linux/blkdev.h>
#include "scsi.h"
#include <linux/sched.h>
#include <linux/blkdev.h>
#include "scsi.h"
-#include
"hosts.h"
+#include
<scsi/scsi_host.h>
#include "g_NCR5380.h"
#include "NCR5380.h"
#include <linux/stat.h>
#include "g_NCR5380.h"
#include "NCR5380.h"
#include <linux/stat.h>
@@
-355,7
+355,7
@@
int __init generic_NCR5380_detect(Scsi_Host_Template * tpnt)
if (!(overrides[current_override].NCR5380_map_name))
continue;
if (!(overrides[current_override].NCR5380_map_name))
continue;
- ports =
0
;
+ ports =
NULL
;
switch (overrides[current_override].board) {
case BOARD_NCR5380:
flags = FLAG_NO_PSEUDO_DMA;
switch (overrides[current_override].board) {
case BOARD_NCR5380:
flags = FLAG_NO_PSEUDO_DMA;
@@
-501,6
+501,10
@@
int generic_NCR5380_release_resources(struct Scsi_Host *instance)
{
NCR5380_local_declare();
NCR5380_setup(instance);
{
NCR5380_local_declare();
NCR5380_setup(instance);
+
+ if (instance->irq != SCSI_IRQ_NONE)
+ free_irq(instance->irq, NULL);
+ NCR5380_exit(instance);
#ifndef CONFIG_SCSI_G_NCR5380_MEM
release_region(instance->NCR5380_instance_name, instance->n_io_port);
#ifndef CONFIG_SCSI_G_NCR5380_MEM
release_region(instance->NCR5380_instance_name, instance->n_io_port);
@@
-508,8
+512,6
@@
int generic_NCR5380_release_resources(struct Scsi_Host *instance)
release_mem_region(instance->NCR5380_instance_name, NCR5380_region_size);
#endif
release_mem_region(instance->NCR5380_instance_name, NCR5380_region_size);
#endif
- if (instance->irq != SCSI_IRQ_NONE)
- free_irq(instance->irq, NULL);
return 0;
}
return 0;
}