diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 10:22:26 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 10:22:26 +0200 |
| commit | 37acd687269f8cb8366598e292f96eb5605d3e3a (patch) | |
| tree | e49cc91bef34755b9a279b60ed8d10ea01eec725 /drivers/ata/ahci.c | |
| parent | Merge branch 'for-4.18/hid-redragon' into for-linus (diff) | |
| parent | HID: steam: select CONFIG_POWER_SUPPLY (diff) | |
| download | linux-37acd687269f8cb8366598e292f96eb5605d3e3a.tar.xz linux-37acd687269f8cb8366598e292f96eb5605d3e3a.zip | |
Merge branch 'for-4.18/hid-steam' into for-linus
Valve Steam Controller support from Rodrigo Rivas Costa
Diffstat (limited to 'drivers/ata/ahci.c')
| -rw-r--r-- | drivers/ata/ahci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 1ff17799769d..6389c88b3500 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -698,7 +698,7 @@ static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, DPRINTK("ENTER\n"); - ahci_stop_engine(ap); + hpriv->stop_engine(ap); rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context), deadline, &online, NULL); @@ -724,7 +724,7 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, bool online; int rc; - ahci_stop_engine(ap); + hpriv->stop_engine(ap); /* clear D2H reception area to properly wait for D2H FIS */ ata_tf_init(link->device, &tf); @@ -788,7 +788,7 @@ static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class, DPRINTK("ENTER\n"); - ahci_stop_engine(ap); + hpriv->stop_engine(ap); for (i = 0; i < 2; i++) { u16 val; |