leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge ../scsi-misc-2.6

Browse Source 
Conflicts:

	drivers/scsi/nsp32.c
	drivers/scsi/pcmcia/nsp_cs.c

Removal of randomness flag conflicts with SA_ -> IRQF_ global
replacement.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
James Bottomley
2006-07-03 09:41:12 -05:00
parent 29454dde27 d6b0c53723
commit c4e00fac42
74 changed files with 4528 additions and 2890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/scsi/nsp32.c
View File

@@ -2866,8 +2866,7 @@ static int nsp32_detect(struct scsi_host_template *sht)
*/
nsp32_do_bus_reset(data);
ret = request_irq(host->irq, do_nsp32_isr,
IRQF_SHARED | IRQF_SAMPLE_RANDOM, "nsp32", data);
ret = request_irq(host->irq, do_nsp32_isr, IRQF_SHARED, "nsp32", data);
if (ret < 0) {
nsp32_msg(KERN_ERR, "Unable to allocate IRQ for NinjaSCSI32 "
"SCSI PCI controller. Interrupt: %d", host->irq);
@@ -2886,12 +2885,19 @@ static int nsp32_detect(struct scsi_host_template *sht)
}
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
scsi_add_host (host, &PCIDEV->dev);
ret = scsi_add_host(host, &PCIDEV->dev);
if (ret) {
nsp32_msg(KERN_ERR, "failed to add scsi host");
goto free_region;
}
scsi_scan_host(host);
#endif
pci_set_drvdata(PCIDEV, host);
return DETECT_OK;
free_region:
release_region(host->io_port, host->n_io_port);
free_irq:
free_irq(host->irq, data);