Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] initio: fix module hangs on loading
+6
-2
+6
-2
drivers/scsi/initio.c
+6
-2
drivers/scsi/initio.c
···
823
823
{
824
824
825
825
#if DEBUG_QUEUE
826
-
printk("append busy SCB %o; ", scbp);
826
+
printk("append busy SCB %p; ", scbp);
827
827
#endif
828
828
if (scbp->tagmsg)
829
829
host->act_tags[scbp->target]++;
···
2609
2609
cblk->bufptr = cpu_to_le32((u32)dma_addr);
2610
2610
cmnd->SCp.dma_handle = dma_addr;
2611
2611
2612
+
cblk->sglen = nseg;
2612
2613
2613
2614
cblk->flags |= SCF_SG; /* Turn on SG list flag */
2614
2615
total_len = 0;
···
2870
2869
host = (struct initio_host *)shost->hostdata;
2871
2870
memset(host, 0, sizeof(struct initio_host));
2872
2871
host->addr = pci_resource_start(pdev, 0);
2872
+
host->bios_addr = bios_seg;
2873
2873
2874
2874
if (!request_region(host->addr, 256, "i91u")) {
2875
2875
printk(KERN_WARNING "initio: I/O port range 0x%x is busy.\n", host->addr);
···
2897
2895
2898
2896
host->pci_dev = pdev;
2899
2897
2898
+
host->semaph = 1;
2899
+
spin_lock_init(&host->semaph_lock);
2900
2900
host->num_scbs = num_scb;
2901
2901
host->scb = scb;
2902
2902
host->next_pending = scb;
···
2915
2911
host->last_avail = prev;
2916
2912
spin_lock_init(&host->avail_lock);
2917
2913
2918
-
initio_init(host, phys_to_virt(bios_seg << 4));
2914
+
initio_init(host, phys_to_virt(((u32)bios_seg << 4)));
2919
2915
2920
2916
host->jsstatus0 = 0;
2921
2917