projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
libata-core.c
diff --git
a/drivers/ata/libata-core.c
b/drivers/ata/libata-core.c
index 9c3c99a995d3cb56c203275e64668f18b9aafc97..c24354d44f3d72266dcf8b3994c5070e6e5e55dd 100644
(file)
--- a/
drivers/ata/libata-core.c
+++ b/
drivers/ata/libata-core.c
@@
-5436,7
+5436,7
@@
static int ata_port_runtime_idle(struct device *dev)
return -EBUSY;
}
return -EBUSY;
}
- return
pm_runtime_suspend(dev)
;
+ return
0
;
}
static int ata_port_runtime_suspend(struct device *dev)
}
static int ata_port_runtime_suspend(struct device *dev)
@@
-6150,6
+6150,8
@@
int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
if (rc)
goto err_tadd;
if (rc)
goto err_tadd;
+ ata_acpi_hotplug_init(host);
+
/* set cable, sata_spd_limit and report */
for (i = 0; i < host->n_ports; i++) {
struct ata_port *ap = host->ports[i];
/* set cable, sata_spd_limit and report */
for (i = 0; i < host->n_ports; i++) {
struct ata_port *ap = host->ports[i];