projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 4.1 to 4.1.10
[openwrt.git]
/
target
/
linux
/
generic
/
patches-4.1
/
834-ledtrig-libata.patch
diff --git
a/target/linux/generic/patches-4.1/834-ledtrig-libata.patch
b/target/linux/generic/patches-4.1/834-ledtrig-libata.patch
index
b794c46
..
84b722d
100644
(file)
--- a/
target/linux/generic/patches-4.1/834-ledtrig-libata.patch
+++ b/
target/linux/generic/patches-4.1/834-ledtrig-libata.patch
@@
-49,7
+49,7
@@
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
depends on ACPI && PCI
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
depends on ACPI && PCI
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
-@@ -728,6 +728,19 @@ u64 ata_tf_read_block(
const struct ata_t
+@@ -728,6 +728,19 @@ u64 ata_tf_read_block(
struct ata_taskfil
return block;
}
return block;
}
@@
-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
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
-@@ -47
89,6 +4802
,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -47
73,6 +4786
,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0)
return NULL;
}
if (tag < 0)
return NULL;
}
@@
-79,7
+79,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;
-@@ -56
86,6 +5702
,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -56
70,6 +5686
,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
@@
-89,7
+89,7
@@
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap);
return ap;
ata_sff_port_init(ap);
return ap;
-@@ -5
707,6 +5726
,12 @@ static void ata_host_release(struct devi
+@@ -5
691,6 +5710
,12 @@ static void ata_host_release(struct devi
kfree(ap->pmp_link);
kfree(ap->slave_link);
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;
}
kfree(ap);
host->ports[i] = NULL;
}
-@@ -61
53,7 +6178
,23 @@ int ata_host_register(struct ata_host *h
+@@ -61
37,7 +6162
,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;
}