Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268695
b: refs/heads/master
c: a3b0b56
h: refs/heads/master
i:
  268693: 74e9cf1
  268691: d7b05da
  268687: 2d6fefb
v: v3
  • Loading branch information
Franky Lin authored and Greg Kroah-Hartman committed Oct 5, 2011
1 parent 8a7e5d6 commit f3a9079
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 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: 019f45f27464e91cd1936a22600a05779bbe5573
refs/heads/master: a3b0b566cd1d0759d26d8357366bb80f08aa069a
12 changes: 2 additions & 10 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -725,14 +725,6 @@ module_param(brcmf_dpc_prio, int, 0);

#define SDIO_DRIVE_STRENGTH 6 /* in milliamps */

/* Use polling */
uint brcmf_poll;
module_param(brcmf_poll, uint, 0);

/* Use interrupts */
uint brcmf_intr = true;
module_param(brcmf_intr, uint, 0);

#define RETRYCHAN(chan) ((chan) == SDPCM_EVENT_CHANNEL)

/* Retry count for register access failures */
Expand Down Expand Up @@ -4324,8 +4316,8 @@ brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva)
BRCMF_SDALIGN);

/* Set the poll and/or interrupt flags */
bus->intr = (bool) brcmf_intr;
bus->poll = (bool) brcmf_poll;
bus->intr = true;
bus->poll = false;
if (bus->poll)
bus->pollrate = 1;

Expand Down

0 comments on commit f3a9079

Please sign in to comment.