Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 158789
b: refs/heads/master
c: 1d3b813
h: refs/heads/master
i:
  158787: ab7c14c
v: v3
  • Loading branch information
Kalle Valo authored and John W. Linville committed Jul 10, 2009
1 parent 56c38b6 commit 687eeca
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ff25839bf0c99e828c26864a24417a36a6b6a31e
refs/heads/master: 1d3b8130611bbe50168ad0a12841735c9c235410
9 changes: 4 additions & 5 deletions trunk/drivers/net/wireless/wl12xx/spi.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,15 @@ void wl12xx_set_partition(struct wl12xx *wl,

static inline u32 wl12xx_read32(struct wl12xx *wl, int addr)
{
u32 response;
wl12xx_spi_read(wl, addr, &wl->buffer_32, sizeof(wl->buffer_32));

wl12xx_spi_read(wl, addr, &response, sizeof(u32));

return response;
return wl->buffer_32;
}

static inline void wl12xx_write32(struct wl12xx *wl, int addr, u32 val)
{
wl12xx_spi_write(wl, addr, &val, sizeof(u32));
wl->buffer_32 = val;
wl12xx_spi_write(wl, addr, &wl->buffer_32, sizeof(wl->buffer_32));
}

#endif /* __WL12XX_SPI_H__ */
2 changes: 2 additions & 0 deletions trunk/drivers/net/wireless/wl12xx/wl12xx.h
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,8 @@ struct wl12xx {

struct wl12xx_stats stats;
struct wl12xx_debugfs debugfs;

u32 buffer_32;
};

int wl12xx_plt_start(struct wl12xx *wl);
Expand Down

0 comments on commit 687eeca

Please sign in to comment.