aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-06-04 07:20:22 +0000
committerJohn Crispin <john@openwrt.org>2014-06-04 07:20:22 +0000
commitf09ac641d6c7f4eb0a667dc72119b5206377870c (patch)
tree7e9061fbc63bbe66ca958a94dcf99a2464cb302d
parent39c5628e5ac7c4c22147ad0762ed4ff002615b77 (diff)
downloadupstream-f09ac641d6c7f4eb0a667dc72119b5206377870c.tar.gz
upstream-f09ac641d6c7f4eb0a667dc72119b5206377870c.tar.bz2
upstream-f09ac641d6c7f4eb0a667dc72119b5206377870c.zip
lantiq: ath5k fix in wifi and ethernet eeprom handling patch.
ath5k fix in wifi and ethernet eeprom handling patch. Without the line that adds the patch of_ath5k_eeprom_probe cause a kernel panic, at least with the ARV4518PW. Tested only in the modem-router mentioned above. This patch is based in Bruno's hack present in patch #5454. Signed off by: Bruno Rodríguez <bruno.rodriguez.1980@gmail.com> Signed off by: José Vázquez Fernández <ppvazquezfer@gmail.com> SVN-Revision: 40999
-rw-r--r--target/linux/lantiq/patches-3.10/0010-MIPS-lantiq-wifi-and-ethernet-eeprom-handling.patch2
1 files changed, 2 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-3.10/0010-MIPS-lantiq-wifi-and-ethernet-eeprom-handling.patch b/target/linux/lantiq/patches-3.10/0010-MIPS-lantiq-wifi-and-ethernet-eeprom-handling.patch
index 403ee97a83..50c0527710 100644
--- a/target/linux/lantiq/patches-3.10/0010-MIPS-lantiq-wifi-and-ethernet-eeprom-handling.patch
+++ b/target/linux/lantiq/patches-3.10/0010-MIPS-lantiq-wifi-and-ethernet-eeprom-handling.patch
@@ -246,6 +246,8 @@ Subject: [PATCH 18/22] owrt: lantiq: wifi and ethernet eeprom handling
+ }
+
+ eep = ioremap(eep_res->start, resource_size(eep_res));
++ ath5k_pdata.eeprom_data = kmalloc(ATH5K_PLAT_EEP_MAX_WORDS<<1,
++ GFP_KERNEL);
+ memcpy_fromio(ath5k_pdata.eeprom_data, eep,
+ ATH5K_PLAT_EEP_MAX_WORDS << 1);
+ }
7'>177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269