Skip to contentSkip to conversation

qlogic: don't use scsi_{register,unregister} for pcmcia

PATCH New Aristeu Sergio Rozanski Filho 1 participant 1 message Oct 24, 2003 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qlogic: don't use scsi_{register,unregister} for pcmcia

Signature · 1 line
aris
drivers/scsi/qlogicfas.c renamed from drivers/scsi/qlogicfas.c.orig +4 -0
@@ -650,7 +650,11 @@
 	} else
 		printk(KERN_INFO "Ql: Using preset IRQ %d\n", qlirq);
 
+#ifdef PCMCIA
+	hreg = scsi_host_alloc(host, 0);
+#else
 	hreg = scsi_register(host, 0);	/* no host data */
+#endif
 	if (!hreg)
 		goto err_release_mem;
 	hreg->io_port = qbase;
drivers/scsi/pcmcia/qlogic_stub.c renamed from drivers/scsi/pcmcia/qlogic_stub.c.orig +1 -1
@@ -288,7 +288,7 @@
 	CardServices(ReleaseIO, link->handle, &link->io);
 	CardServices(ReleaseIRQ, link->handle, &link->irq);
 
-	scsi_unregister(info->host);
+	scsi_host_put(info->host);
 
 	link->state &= ~DEV_CONFIG;
 }