From linux-scsi Tue Dec 06 16:38:04 2011 From: Holger Macht Date: Tue, 06 Dec 2011 16:38:04 +0000 To: linux-scsi Subject: [PATCH 6/7] libata: Generate and pass correct acpi handles Message-Id: <20111206163804.GG3629 () homac ! suse ! de> X-MARC-Message: https://marc.info/?l=linux-scsi&m=132318957732266 Fix ACPI handle generation for device handles and pass the correct handles to the dock driver. Signed-off-by: Holger Macht --- libata-acpi.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) Index: linux/drivers/ata/libata-acpi.c =================================================================== --- linux.orig/drivers/ata/libata-acpi.c +++ linux/drivers/ata/libata-acpi.c @@ -74,9 +74,6 @@ acpi_handle ata_dev_acpi_handle(struct a acpi_integer adr; struct ata_port *ap = dev->link->ap; - if (dev->sdev) - return DEVICE_ACPI_HANDLE(&dev->sdev->sdev_gendev); - if (ap->flags & ATA_FLAG_ACPI_SATA) { if (!sata_pmp_attached(ap)) adr = SATA_ADR(ap->port_no, NO_PORT_MULT); @@ -1004,8 +1001,7 @@ static int ata_acpi_bind_host(struct dev if (!*handle) return -ENODEV; - register_hotplug_dock_device(ata_ap_acpi_handle(ap), - &ata_acpi_ap_dock_ops, ap); + register_hotplug_dock_device(*handle, &ata_acpi_ap_dock_ops, ap); return 0; } @@ -1027,8 +1023,8 @@ static int ata_acpi_bind_device(struct d if (!*handle) return -ENODEV; - register_hotplug_dock_device(ata_dev_acpi_handle(ata_dev), - &ata_acpi_dev_dock_ops, ata_dev); + + register_hotplug_dock_device(*handle, &ata_acpi_dev_dock_ops, ata_dev); return 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html