[POWERPC] QE: fix invalid pointer usage in ucc_slow_init()

[powerpc.git] / drivers / scsi / cyberstormII.c

diff --git a/drivers/scsi/cyberstormII.c b/drivers/scsi/cyberstormII.c
index 3a803d7..e336e85 100644 (file)
--- a/drivers/scsi/cyberstormII.c
+++ b/drivers/scsi/cyberstormII.c
@@ -98,7 +98,7 @@ int __init cyberII_esp_detect(struct scsi_host_template *tpnt)
                address = (unsigned long)ZTWO_VADDR(board);
                eregs = (struct ESP_regs *)(address + CYBERII_ESP_ADDR);
 
-               esp = esp_allocate(tpnt, (void *)board+CYBERII_ESP_ADDR);
+               esp = esp_allocate(tpnt, (void *)board + CYBERII_ESP_ADDR, 0);
 
                esp_write(eregs->esp_cfg1, (ESP_CONFIG1_PENABLE | 7));
                udelay(5);
@@ -153,7 +153,7 @@ int __init cyberII_esp_detect(struct scsi_host_template *tpnt)
                esp->esp_command_dvma = virt_to_bus((void *)cmd_buffer);
 
                esp->irq = IRQ_AMIGA_PORTS;
-               request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ,
+               request_irq(IRQ_AMIGA_PORTS, esp_intr, IRQF_SHARED,
                            "CyberStorm SCSI Mk II", esp->ehost);
 
                /* Figure out our scsi ID on the bus */