Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fixes from Tejun Heo:
"libata device removal path was removing parent device node before its
child, which is mostly harmless but triggers warning after recent
sysfs changes. Rafael's patch fixes the order.
Other than that, minor controller-specific fixes and device ID
additions"
* 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
ATA: Fix port removal ordering
ahci: add Marvell 9230 to the AHCI PCI device list
ata: fix acpi_bus_get_device() return value check
pata_arasan_cf: add missing clk_disable_unprepare() on error path
ahci: add support for IBM Akebono platform device
+6
-5
+2
drivers/ata/ahci.c
+2
drivers/ata/ahci.c
···
435
435
.driver_data = board_ahci_yes_fbs }, /* 88se9172 on some Gigabyte */
436
436
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a3),
437
437
.driver_data = board_ahci_yes_fbs },
438
+
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9230),
439
+
.driver_data = board_ahci_yes_fbs },
438
440
439
441
/* Promise */
440
442
{ PCI_VDEVICE(PROMISE, 0x3f20), board_ahci }, /* PDC42819 */
+1
drivers/ata/ahci_platform.c
+1
drivers/ata/ahci_platform.c
+1
-2
drivers/ata/libata-core.c
+1
-2
drivers/ata/libata-core.c
···
6304
6304
for (i = 0; i < SATA_PMP_MAX_PORTS; i++)
6305
6305
ata_tlink_delete(&ap->pmp_link[i]);
6306
6306
}
6307
-
ata_tport_delete(ap);
6308
-
6309
6307
/* remove the associated SCSI host */
6310
6308
scsi_remove_host(ap->scsi_host);
6309
+
ata_tport_delete(ap);
6311
6310
}
6312
6311
6313
6312
/**
+1
-3
drivers/ata/libata-zpodd.c
+1
-3
drivers/ata/libata-zpodd.c
···
88
88
static bool odd_can_poweroff(struct ata_device *ata_dev)
89
89
{
90
90
acpi_handle handle;
91
-
acpi_status status;
92
91
struct acpi_device *acpi_dev;
93
92
94
93
handle = ata_dev_acpi_handle(ata_dev);
95
94
if (!handle)
96
95
return false;
97
96
98
-
status = acpi_bus_get_device(handle, &acpi_dev);
99
-
if (ACPI_FAILURE(status))
97
+
if (acpi_bus_get_device(handle, &acpi_dev))
100
98
return false;
101
99
102
100
return acpi_device_can_poweroff(acpi_dev);