From 1b3a14e246718d9774e11069fbe93133dc90c998 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 8 Nov 2005 14:09:44 +0000 Subject: [PATCH] --- yaml --- r: 13879 b: refs/heads/master c: e99f8b5efe78110e4af10f35ebf11feeef8f43b6 h: refs/heads/master i: 13877: 4d280620fd848150265c12295e26b4c32358532e 13875: 267221e56c785fdd791b5967e1496927654fbf43 13871: ef2080043656d6e4d5f08193abd9872efead3a55 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-core.c | 2 ++ trunk/include/linux/libata.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bebc1c133f46..d76c0fbf1033 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29179539dac74bf46b519b889602f23841be12e8 +refs/heads/master: e99f8b5efe78110e4af10f35ebf11feeef8f43b6 diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index a74b4071a662..e51d9a8a2796 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/drivers/scsi/libata-core.c @@ -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) { diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h index a5390313c7b4..1464a7586de8 100644 --- a/trunk/include/linux/libata.h +++ b/trunk/include/linux/libata.h @@ -405,6 +405,7 @@ struct ata_port_info { unsigned long mwdma_mask; unsigned long udma_mask; const struct ata_port_operations *port_ops; + void *private_data; }; struct ata_timing {