if (SCpnt->use_sg) {
pci_unmap_sg(data->Pci,
- (struct scatterlist *)SCpnt->request_buffer,
+ (struct scatterlist *)SCpnt->buffer,
SCpnt->use_sg, SCpnt->sc_data_direction);
} else {
pci_unmap_single(data->Pci,
*/
nsp32_do_bus_reset(data);
- ret = request_irq(host->irq, do_nsp32_isr, IRQF_SHARED, "nsp32", data);
+ ret = request_irq(host->irq, do_nsp32_isr,
+ SA_SHIRQ | SA_SAMPLE_RANDOM, "nsp32", data);
if (ret < 0) {
nsp32_msg(KERN_ERR, "Unable to allocate IRQ for NinjaSCSI32 "
"SCSI PCI controller. Interrupt: %d", host->irq);
}
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
- ret = scsi_add_host(host, &PCIDEV->dev);
- if (ret) {
- nsp32_msg(KERN_ERR, "failed to add scsi host");
- goto free_region;
- }
+ scsi_add_host (host, &PCIDEV->dev);
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);