aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-3.18/834-ledtrig-libata.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-11-14 13:47:36 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-11-14 16:27:43 +0100
commitf7a406deafb4d2524f46a405d84a6d20c65022a9 (patch)
treeea721481d869d1f4fd3bfb6fc504bdac00d18852 /target/linux/generic/pending-3.18/834-ledtrig-libata.patch
parent042d68a19593ac796098845366a235f5465816da (diff)
downloadupstream-f7a406deafb4d2524f46a405d84a6d20c65022a9.tar.gz
upstream-f7a406deafb4d2524f46a405d84a6d20c65022a9.tar.bz2
upstream-f7a406deafb4d2524f46a405d84a6d20c65022a9.zip
kernel: bump 3.18 to 3.18.125
Refreshed all patches. Compile-tested on: adm5120 Compile-tested on: none Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-3.18/834-ledtrig-libata.patch')
-rw-r--r--target/linux/generic/pending-3.18/834-ledtrig-libata.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-3.18/834-ledtrig-libata.patch b/target/linux/generic/pending-3.18/834-ledtrig-libata.patch
index 25dffdc58d..7a32e7f8ea 100644
--- a/target/linux/generic/pending-3.18/834-ledtrig-libata.patch
+++ b/target/linux/generic/pending-3.18/834-ledtrig-libata.patch
@@ -69,7 +69,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
-@@ -4825,6 +4838,9 @@ static struct ata_queued_cmd *ata_qc_new
+@@ -4827,6 +4840,9 @@ static struct ata_queued_cmd *ata_qc_new
break;
}
}
@@ -79,7 +79,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
return qc;
}
-@@ -5734,6 +5750,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -5736,6 +5752,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
@@ -89,7 +89,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap);
return ap;
-@@ -5755,6 +5774,12 @@ static void ata_host_release(struct devi
+@@ -5757,6 +5776,12 @@ static void ata_host_release(struct devi
kfree(ap->pmp_link);
kfree(ap->slave_link);
@@ -102,7 +102,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap);
host->ports[i] = NULL;
}
-@@ -6201,7 +6226,23 @@ int ata_host_register(struct ata_host *h
+@@ -6203,7 +6228,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}