projects
/
openwrt
/
staging
/
chunkeey.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.9 to 4.9.82
[openwrt/staging/chunkeey.git]
/
target
/
linux
/
generic
/
pending-4.9
/
834-ledtrig-libata.patch
diff --git
a/target/linux/generic/pending-4.9/834-ledtrig-libata.patch
b/target/linux/generic/pending-4.9/834-ledtrig-libata.patch
index 44ee23fb9bbff5b7fae577d3961ad830a1e597f1..50eaa52e97bedc2af9715ba4a8d1f9ff68a5d93e 100644
(file)
--- a/
target/linux/generic/pending-4.9/834-ledtrig-libata.patch
+++ b/
target/linux/generic/pending-4.9/834-ledtrig-libata.patch
@@
-65,7
+65,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
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
-@@ -496
3,6 +4976
,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -496
4,6 +4977
,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0)
return NULL;
}
if (tag < 0)
return NULL;
}
@@
-75,7
+75,7
@@
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
qc = __ata_qc_from_tag(ap, tag);
qc->tag = tag;
qc = __ata_qc_from_tag(ap, tag);
qc->tag = tag;
-@@ -586
5,6 +5881
,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -586
6,6 +5882
,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
@@
-85,7
+85,7
@@
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap);
return ap;
ata_sff_port_init(ap);
return ap;
-@@ -588
6,6 +5905
,12 @@ static void ata_host_release(struct devi
+@@ -588
7,6 +5906
,12 @@ static void ata_host_release(struct devi
kfree(ap->pmp_link);
kfree(ap->slave_link);
kfree(ap->pmp_link);
kfree(ap->slave_link);
@@
-98,7
+98,7
@@
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap);
host->ports[i] = NULL;
}
kfree(ap);
host->ports[i] = NULL;
}
-@@ -633
2,7 +6357
,23 @@ int ata_host_register(struct ata_host *h
+@@ -633
3,7 +6358
,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;
}
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}