OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 63... Line 63...
63 +#endif 63 +#endif
64 + 64 +
65 /** 65 /**
66 * ata_build_rw_tf - Build ATA taskfile for given read/write request 66 * ata_build_rw_tf - Build ATA taskfile for given read/write request
67 * @tf: Target ATA taskfile 67 * @tf: Target ATA taskfile
68 @@ -5121,6 +5134,9 @@ struct ata_queued_cmd *ata_qc_new_init(s 68 @@ -5120,6 +5133,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
69 if (tag < 0) 69 if (tag < 0)
70 return NULL; 70 return NULL;
71 } 71 }
72 +#ifdef CONFIG_ATA_LEDS 72 +#ifdef CONFIG_ATA_LEDS
73 + ata_led_act(ap); 73 + ata_led_act(ap);
74 +#endif 74 +#endif
Line 75... Line 75...
75 75
76 qc = __ata_qc_from_tag(ap, tag); 76 qc = __ata_qc_from_tag(ap, tag);
77 qc->tag = tag; 77 qc->tag = tag;
78 @@ -6022,6 +6038,9 @@ struct ata_port *ata_port_alloc(struct a 78 @@ -6021,6 +6037,9 @@ struct ata_port *ata_port_alloc(struct a
79 ap->stats.unhandled_irq = 1; 79 ap->stats.unhandled_irq = 1;
80 ap->stats.idle_irq = 1; 80 ap->stats.idle_irq = 1;
81 #endif 81 #endif
82 +#ifdef CONFIG_ATA_LEDS 82 +#ifdef CONFIG_ATA_LEDS
83 + ap->ledtrig = kzalloc(sizeof(struct led_trigger), GFP_KERNEL); 83 + ap->ledtrig = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);
84 +#endif 84 +#endif
Line 85... Line 85...
85 ata_sff_port_init(ap); 85 ata_sff_port_init(ap);
86 86
Line 87... Line 87...
87 return ap; 87 return ap;
88 @@ -6043,6 +6062,12 @@ static void ata_host_release(struct devi 88 @@ -6042,6 +6061,12 @@ static void ata_host_release(struct devi
89 89
90 kfree(ap->pmp_link); 90 kfree(ap->pmp_link);
Line 96... Line 96...
96 + }; 96 + };
97 +#endif 97 +#endif
98 kfree(ap); 98 kfree(ap);
99 host->ports[i] = NULL; 99 host->ports[i] = NULL;
100 } 100 }
101 @@ -6489,7 +6514,23 @@ int ata_host_register(struct ata_host *h 101 @@ -6488,7 +6513,23 @@ int ata_host_register(struct ata_host *h
102 host->ports[i]->print_id = atomic_inc_return(&ata_print_id); 102 host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
103 host->ports[i]->local_port_no = i + 1; 103 host->ports[i]->local_port_no = i + 1;
104 } 104 }
105 +#ifdef CONFIG_ATA_LEDS 105 +#ifdef CONFIG_ATA_LEDS
106 + for (i = 0; i < host->n_ports; i++) { 106 + for (i = 0; i < host->n_ports; i++) {