Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b800407 authored by Ido Yariv's avatar Ido Yariv Committed by Luciano Coelho
Browse files

wlcore: Propagate errors from wl1271_read_hwaddr 



Propagate errors from wl1271_read_hwaddr. This function is only used
when reading the FW log (following a recovery), so don't read the FW log
in case of a bus error.

Also rename prefixes of wlcore functions which their prototypes had to
be changed.

Signed-off-by: default avatarIdo Yariv <ido@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent b0f0ad39

drivers/net/wireless/ti/wlcore/io.h

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static inline int wlcore_read_data(struct wl1271 *wl, int reg, void *buf, 
	return wlcore_read(wl, wl->rtable[reg], buf, len, fixed);

}



static inline void wl1271_read_hwaddr(struct wl1271 *wl, int hwaddr,

static inline int wlcore_read_hwaddr(struct wl1271 *wl, int hwaddr,

				      void *buf, size_t len, bool fixed)

{

	int physical;
@@ -142,7 +142,7 @@ static inline void wl1271_read_hwaddr(struct wl1271 *wl, int hwaddr, 


	physical = wlcore_translate_addr(wl, addr);



	wlcore_raw_read(wl, physical, buf, len, fixed);

	return wlcore_raw_read(wl, physical, buf, len, fixed);

}



static inline int wlcore_read32(struct wl1271 *wl, int addr, u32 *val)

drivers/net/wireless/ti/wlcore/main.c

+4 −2
Original line number Diff line number Diff line
@@ -851,8 +851,10 @@ static void wl12xx_read_fwlog_panic(struct wl1271 *wl) 
	/* Traverse the memory blocks linked list */

	do {

		memset(block, 0, WL12XX_HW_BLOCK_SIZE);

		wl1271_read_hwaddr(wl, addr, block, WL12XX_HW_BLOCK_SIZE,

		ret = wlcore_read_hwaddr(wl, addr, block, WL12XX_HW_BLOCK_SIZE,

					 false);

		if (ret < 0)

			goto out;



		/*

		 * Memory blocks are linked to one another. The first 4 bytes