diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-23 12:33:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-23 12:33:36 -0700 |
| commit | c8c1f16717b05a9f787e054ada1ddd6dbb910364 (patch) | |
| tree | 9a34b44254863d390655491d286720262f1e725d /drivers/ata/libata-acpi.c | |
| parent | df2a8f39cdecdf59be797b9c86b26f90b37321e7 (diff) | |
| parent | b186affe0c9d39e4d3152cd34bffea8fe1fa17f4 (diff) | |
| download | linux-c8c1f16717b05a9f787e054ada1ddd6dbb910364.tar.gz linux-c8c1f16717b05a9f787e054ada1ddd6dbb910364.tar.bz2 linux-c8c1f16717b05a9f787e054ada1ddd6dbb910364.zip | |
Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
Pull libata updates from Jeff Garzik:
"Simple stuff. See one-line summaries."
* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_samsung_cf: use module_platform_driver_probe()
[libata] Avoid specialized TLA's in ZPODD's Kconfig
libata-acpi.c: fix copy and paste mistake in ata_acpi_register_power_resource
sata_fsl: Remove redundant NULL check before kfree
ahci: Add Device IDs for Intel Wellsburg PCH
ata_piix: Add MODULE_PARM_DESC to prefer_ms_hyperv
Diffstat (limited to 'drivers/ata/libata-acpi.c')
| -rw-r--r-- | drivers/ata/libata-acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index beea3115577e..8a52dab412e2 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c @@ -1027,7 +1027,7 @@ static void ata_acpi_register_power_resource(struct ata_device *dev) handle = ata_dev_acpi_handle(dev); if (handle) - acpi_dev_pm_remove_dependent(handle, &sdev->sdev_gendev); + acpi_dev_pm_add_dependent(handle, &sdev->sdev_gendev); } static void ata_acpi_unregister_power_resource(struct ata_device *dev) |