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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
scsi
/
sim710.c
diff --git
a/drivers/scsi/sim710.c
b/drivers/scsi/sim710.c
index
b27e854
..
9171788
100644
(file)
--- a/
drivers/scsi/sim710.c
+++ b/
drivers/scsi/sim710.c
@@
-26,6
+26,7
@@
*
*/
*
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/blkdev.h>
#include <linux/module.h>
#include <linux/blkdev.h>
@@
-74,7
+75,7
@@
param_setup(char *str)
else if(!strncmp(pos, "id:", 3)) {
if(slot == -1) {
printk(KERN_WARNING "sim710: Must specify slot for id parameter\n");
else if(!strncmp(pos, "id:", 3)) {
if(slot == -1) {
printk(KERN_WARNING "sim710: Must specify slot for id parameter\n");
- } else if(slot >
=
MAX_SLOTS) {
+ } else if(slot > MAX_SLOTS) {
printk(KERN_WARNING "sim710: Illegal slot %d for id %d\n", slot, val);
} else {
id_array[slot] = val;
printk(KERN_WARNING "sim710: Illegal slot %d for id %d\n", slot, val);
} else {
id_array[slot] = val;
@@
-133,7
+134,7
@@
sim710_probe_common(struct device *dev, unsigned long base_addr,
host->this_id = scsi_id;
host->base = base_addr;
host->irq = irq;
host->this_id = scsi_id;
host->base = base_addr;
host->irq = irq;
- if (request_irq(irq, NCR_700_intr,
IRQF_SHARED
, "sim710", host)) {
+ if (request_irq(irq, NCR_700_intr,
SA_SHIRQ
, "sim710", host)) {
printk(KERN_ERR "sim710: request_irq failed\n");
goto out_put_host;
}
printk(KERN_ERR "sim710: request_irq failed\n");
goto out_put_host;
}
@@
-145,7
+146,7
@@
sim710_probe_common(struct device *dev, unsigned long base_addr,
out_put_host:
scsi_host_put(host);
out_release:
out_put_host:
scsi_host_put(host);
out_release:
- release_region(
base_addr
, 64);
+ release_region(
host->base
, 64);
out_free:
kfree(hostdata);
out:
out_free:
kfree(hostdata);
out: