tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
drivers/ata/pata_octeon_cf.c: delete double assignment
pata_legacy: fix CONFIG_PATA_WINBOND_VLB_MODULE test
libata: fix NULL sdev dereference race in atapi_qc_complete()

Linus Torvalds 80ef913f 1c32ca9f

+5 -4
+4 -1
drivers/ata/libata-scsi.c
··· 2552 2552 * 2553 2553 * If door lock fails, always clear sdev->locked to 2554 2554 * avoid this infinite loop. 2555 + * 2556 + * This may happen before SCSI scan is complete. Make 2557 + * sure qc->dev->sdev isn't NULL before dereferencing. 2555 2558 */ 2556 - if (qc->cdb[0] == ALLOW_MEDIUM_REMOVAL) 2559 + if (qc->cdb[0] == ALLOW_MEDIUM_REMOVAL && qc->dev->sdev) 2557 2560 qc->dev->sdev->locked = 0; 2558 2561 2559 2562 qc->scsicmd->result = SAM_STAT_CHECK_CONDITION;
+1 -1
drivers/ata/pata_legacy.c
··· 142 142 static int pio_mask = ATA_PIO4; /* PIO range for autospeed devices */ 143 143 static int iordy_mask = 0xFFFFFFFF; /* Use iordy if available */ 144 144 145 - #ifdef PATA_WINBOND_VLB_MODULE 145 + #ifdef CONFIG_PATA_WINBOND_VLB_MODULE 146 146 static int winbond = 1; /* Set to probe Winbond controllers, 147 147 give I/O port if non standard */ 148 148 #else
-2
drivers/ata/pata_octeon_cf.c
··· 653 653 654 654 ap = host->ports[i]; 655 655 ocd = ap->dev->platform_data; 656 - 657 - ocd = ap->dev->platform_data; 658 656 cf_port = ap->private_data; 659 657 dma_int.u64 = 660 658 cvmx_read_csr(CVMX_MIO_BOOT_DMA_INTX(ocd->dma_engine));