Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80ef913f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 1c32ca9f f2543790

drivers/ata/libata-scsi.c

+4 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -652,8 +652,6 @@ static irqreturn_t octeon_cf_interrupt(int irq, void *dev_instance) 
		struct octeon_cf_data *ocd;



		ap = host->ports[i];

		ocd = ap->dev->platform_data;



		ocd = ap->dev->platform_data;

		cf_port = ap->private_data;

		dma_int.u64 =