libata fixes
PATCH 1/1 libata fixes
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
to receive the following updates:
drivers/ata/libata-scsi.c | 5 ++++- drivers/ata/pata_legacy.c | 2 +- drivers/ata/pata_octeon_cf.c | 2 -- 3 files changed, 5 insertions(+), 4 deletions(-)
Julia Lawall (1):
drivers/ata/pata_octeon_cf.c: delete double assignment
Tejun Heo (2):
libata: fix NULL sdev dereference race in atapi_qc_complete()
pata_legacy: fix CONFIG_PATA_WINBOND_VLB_MODULE test
drivers/ata/libata-scsi.c +4 -1
@@ -2552,8 +2552,11 @@ static void atapi_qc_complete(struct ata_queued_cmd *qc)* * If door lock fails, always clear sdev->locked to * avoid this infinite loop. +* +* This may happen before SCSI scan is complete. Make +* sure qc->dev->sdev isn't NULL before dereferencing. */ -if (qc->cdb[0 ] ==ALLOW_MEDIUM_REMOVAL ) +if (qc->cdb[0 ] ==ALLOW_MEDIUM_REMOVAL && qc->dev->sdev) qc->dev->sdev->locked =0 ; qc->scsicmd->result =SAM_STAT_CHECK_CONDITION ;
drivers/ata/pata_legacy.c +1 -1
@@ -142,7 +142,7 @@ static int autospeed; /* Chip present which snoops speed changes */static int pio_mask =ATA_PIO4 ;/* PIO range for autospeed devices */ static int iordy_mask =0xFFFFFFFF ;/* Use iordy if available */ -#ifdef PATA_WINBOND_VLB_MODULE +#ifdef CONFIG_PATA_WINBOND_VLB_MODULE static int winbond =1 ;/* Set to probe Winbond controllers, give I/O port if non standard */ #else
drivers/ata/pata_octeon_cf.c +0 -2
@@ -653,8 +653,6 @@ static irqreturn_t octeon_cf_interrupt(int irq, void *dev_instance) ap = host->ports[i]; ocd = ap->dev->platform_data; - - ocd = ap->dev->platform_data; cf_port = ap->private_data; dma_int.u64 =cvmx_read_csr (CVMX_MIO_BOOT_DMA_INTX (ocd->dma_engine));