---

yaml --- r: 314917 b: refs/heads/master c: 9bd02c6 h: refs/heads/master i: 314915: e8aed07 v: v3
git-mirror · Jun 27, 2012 · d9660d4 · d9660d4
1 parent 3edd728
commit d9660d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85a4a1c3bc42e7ab7027f94984be04e41a7cc496
+refs/heads/master: 9bd02c6b9e6219829929111c46ef007c7a76865f
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -3145,7 +3145,7 @@ static int brcmf_sdio_trap_info(struct brcmf_sdio *bus, struct sdpcm_shared *sh,
 			le32_to_cpu(tr.type), le32_to_cpu(tr.epc),
 			le32_to_cpu(tr.cpsr), le32_to_cpu(tr.spsr),
 			le32_to_cpu(tr.r13), le32_to_cpu(tr.r14),
-			le32_to_cpu(tr.pc), le32_to_cpu(sh->trap_addr),
+			le32_to_cpu(tr.pc), sh->trap_addr,
 			le32_to_cpu(tr.r0), le32_to_cpu(tr.r1),
 			le32_to_cpu(tr.r2), le32_to_cpu(tr.r3),
 			le32_to_cpu(tr.r4), le32_to_cpu(tr.r5),