diff options
| author |   James Morris <james.morris@microsoft.com> | 2018-09-04 11:35:54 -0700 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-09-04 11:35:54 -0700 |
| commit | e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce (patch) | |
| tree | f956a5ea0e83fc6d0df3e64681e7bbc1f201f3ee /drivers/ata/ahci_st.c | |
| parent | security/capabilities: remove check for -EINVAL (diff) | |
| parent | Linux 4.19-rc2 (diff) | |
| download | linux-dev-e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce.tar.xz linux-dev-e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce.zip | |
Merge tag 'v4.19-rc2' into next-general
Sync to Linux 4.19-rc2 for downstream developers.
Diffstat (limited to '')
| -rw-r--r-- | drivers/ata/ahci_st.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c index bc345f249555..21c5c44832ef 100644 --- a/drivers/ata/ahci_st.c +++ b/drivers/ata/ahci_st.c @@ -156,7 +156,7 @@ static int st_ahci_probe(struct platform_device *pdev) if (!drv_data) return -ENOMEM; - hpriv = ahci_platform_get_resources(pdev); + hpriv = ahci_platform_get_resources(pdev, 0); if (IS_ERR(hpriv)) return PTR_ERR(hpriv); hpriv->plat_data = drv_data; |