aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/patches/0122-ata-ahci_platform-fix-devm_ioremap_resource-return-v.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-09-10 21:40:19 +0000
committerLuka Perkov <luka@openwrt.org>2014-09-10 21:40:19 +0000
commite5441232a81d01e2ed46d88e340a30fd6b15b012 (patch)
treee008cc6bd24a0e2c9b283d94a69f7a027bcfb856 /target/linux/ipq806x/patches/0122-ata-ahci_platform-fix-devm_ioremap_resource-return-v.patch
parent048910c4e07b6fae28513ce1dea62fe3b6bb03de (diff)
downloadupstream-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.gz
upstream-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.bz2
upstream-e5441232a81d01e2ed46d88e340a30fd6b15b012.zip
kernel: update 3.14 to 3.14.18
Targets were build tested and patches are refreshed. Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42463 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ipq806x/patches/0122-ata-ahci_platform-fix-devm_ioremap_resource-return-v.patch')
-rw-r--r--target/linux/ipq806x/patches/0122-ata-ahci_platform-fix-devm_ioremap_resource-return-v.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/ipq806x/patches/0122-ata-ahci_platform-fix-devm_ioremap_resource-return-v.patch b/target/linux/ipq806x/patches/0122-ata-ahci_platform-fix-devm_ioremap_resource-return-v.patch
index 1a5925b48a..322a039606 100644
--- a/target/linux/ipq806x/patches/0122-ata-ahci_platform-fix-devm_ioremap_resource-return-v.patch
+++ b/target/linux/ipq806x/patches/0122-ata-ahci_platform-fix-devm_ioremap_resource-return-v.patch
@@ -16,11 +16,9 @@ Signed-off-by: Tejun Heo <tj@kernel.org>
drivers/ata/ahci_platform.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
-index db24d2a..70fbf66 100644
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
-@@ -199,8 +199,7 @@ static void ahci_platform_put_resources(struct device *dev, void *res)
+@@ -199,8 +199,7 @@ static void ahci_platform_put_resources(
* RETURNS:
* The allocated ahci_host_priv on success, otherwise an ERR_PTR value
*/
@@ -30,7 +28,7 @@ index db24d2a..70fbf66 100644
{
struct device *dev = &pdev->dev;
struct ahci_host_priv *hpriv;
-@@ -219,8 +218,9 @@ struct ahci_host_priv *ahci_platform_get_resources(
+@@ -219,8 +218,9 @@ struct ahci_host_priv *ahci_platform_get
hpriv->mmio = devm_ioremap_resource(dev,
platform_get_resource(pdev, IORESOURCE_MEM, 0));
@@ -41,6 +39,3 @@ index db24d2a..70fbf66 100644
goto err_out;
}
---
-1.7.10.4
-