kernel: bump 3.18 to 3.18.119

[openwrt/openwrt.git] / target / linux / generic / pending-3.18 / 834-ledtrig-libata.patch

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 d0aee1c2d061e2225ed3b5ecbacfa064bdab2c93..25dffdc58d5ef9d53ecdf972a04cc73e3aaf579d 100644 (file)
--- 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
-@@ -4800,6 +4813,9 @@ static struct ata_queued_cmd *ata_qc_new
+@@ -4825,6 +4838,9 @@ static struct ata_queued_cmd *ata_qc_new
                        break;
                }
        }
@@ -79,7 +79,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
        return qc;
  }
-@@ -5710,6 +5726,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -5734,6 +5750,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;
-@@ -5731,6 +5750,12 @@ static void ata_host_release(struct devi
+@@ -5755,6 +5774,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;
        }
-@@ -6177,7 +6202,23 @@ int ata_host_register(struct ata_host *h
+@@ -6201,7 +6226,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;
        }