X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Fsim710.c;fp=drivers%2Fscsi%2Fsim710.c;h=9171788348c485211ac70ea5f8f042ca38a2fe7e;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=b27e85428daab7a59decef0a2ba3e170afb0bca2;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/scsi/sim710.c b/drivers/scsi/sim710.c
index b27e85428..917178834 100644
--- 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>
@@ -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(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;
@@ -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;
-	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;
 	}
@@ -145,7 +146,7 @@ sim710_probe_common(struct device *dev, unsigned long base_addr,
  out_put_host:
 	scsi_host_put(host);
  out_release:
-	release_region(base_addr, 64);
+	release_region(host->base, 64);
  out_free:
 	kfree(hostdata);
  out: