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

Commit 0893dd32 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 60686744 42517438

drivers/scsi/libata-scsi.c

+1 −0
Original line number Diff line number Diff line
@@ -385,6 +385,7 @@ int ata_scsi_error(struct Scsi_Host *host) 
	 * appropriate place

	 */

	host->host_failed--;

	INIT_LIST_HEAD(&host->eh_cmd_q);



	DPRINTK("EXIT\n");

	return 0;

drivers/scsi/sata_sx4.c

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static void pdc20621_dma_prep(struct ata_queued_cmd *qc) 
	for (i = 0; i < last; i++) {

		buf[idx++] = cpu_to_le32(sg_dma_address(&sg[i]));

		buf[idx++] = cpu_to_le32(sg_dma_len(&sg[i]));

		total_len += sg[i].length;

		total_len += sg_dma_len(&sg[i]);

	}

	buf[idx - 1] |= cpu_to_le32(ATA_PRD_EOT);

	sgt_len = idx * 4;