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

Commit 4ba529a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 41866a56 dcc2d1e7

drivers/scsi/libata-core.c

+1 −2
Original line number Diff line number Diff line
@@ -532,8 +532,7 @@ void ata_tf_to_fis(const struct ata_taskfile *tf, u8 *fis, u8 pmp) 
 *	@fis: Buffer from which data will be input

 *	@tf: Taskfile to output

 *

 *	Converts a standard ATA taskfile to a Serial ATA

 *	FIS structure (Register - Host to Device).

 *	Converts a serial ATA FIS structure to a standard ATA taskfile.

 *

 *	LOCKING:

 *	Inherited from caller.

drivers/scsi/libata-scsi.c

+6 −0
Original line number Diff line number Diff line
@@ -2276,6 +2276,12 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd) 
		tf->device = scsicmd[8];

		tf->command = scsicmd[9];

	}

	/*

	 * If slave is possible, enforce correct master/slave bit

	*/

	if (qc->ap->flags & ATA_FLAG_SLAVE_POSS)

		tf->device = qc->dev->devno ?

			tf->device | ATA_DEV1 : tf->device & ~ATA_DEV1;



	/*

	 * Filter SET_FEATURES - XFER MODE command -- otherwise,

drivers/scsi/sata_sil24.c

+1 −0
Original line number Diff line number Diff line
@@ -687,6 +687,7 @@ static void sil24_port_stop(struct ata_port *ap) 
	struct sil24_port_priv *pp = ap->private_data;



	sil24_cblk_free(pp, dev);

	ata_pad_free(ap, dev);

	kfree(pp);

}