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

Commit d5eebf42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 5643f000 e99f8b5e

drivers/scsi/ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static struct ata_port_info ahci_port_info[] = { 
	},

};



static struct pci_device_id ahci_pci_tbl[] = {

static const struct pci_device_id ahci_pci_tbl[] = {

	{ PCI_VENDOR_ID_INTEL, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH6 */

	{ PCI_VENDOR_ID_INTEL, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

drivers/scsi/ata_piix.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev); 


static unsigned int in_module_init = 1;



static struct pci_device_id piix_pci_tbl[] = {

static const struct pci_device_id piix_pci_tbl[] = {

#ifdef ATA_ENABLE_PATA

	{ 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix4_pata },

	{ 0x8086, 0x24db, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_pata },

drivers/scsi/libata-core.c

+2 −0
Original line number Diff line number Diff line
@@ -4563,6 +4563,7 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int 


	probe_ent->irq = pdev->irq;

	probe_ent->irq_flags = SA_SHIRQ;

	probe_ent->private_data = port[0]->private_data;



	if (ports & ATA_PORT_PRIMARY) {

		probe_ent->port[p].cmd_addr = pci_resource_start(pdev, 0);
@@ -4599,6 +4600,7 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, stru 
	probe_ent->legacy_mode = 1;

	probe_ent->n_ports = 1;

	probe_ent->hard_port_no = port_num;

	probe_ent->private_data = port->private_data;



	switch(port_num)

	{

drivers/scsi/libata-scsi.c

+2 −0
Original line number Diff line number Diff line
@@ -1129,6 +1129,8 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm 
		 * length 0 means transfer 0 block of data.

		 * However, for ATA R/W commands, sector count 0 means

		 * 256 or 65536 sectors, not 0 sectors as in SCSI.

		 *

		 * WARNING: one or two older ATA drives treat 0 as 0...

		 */

		goto nothing_to_do;

drivers/scsi/pdc_adma.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static struct ata_port_info adma_port_info[] = { 
	},

};



static struct pci_device_id adma_ata_pci_tbl[] = {

static const struct pci_device_id adma_ata_pci_tbl[] = {

	{ PCI_VENDOR_ID_PDC, 0x1841, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_1841_idx },