diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-29 13:46:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-29 13:46:24 -0700 |
| commit | 1bddc59c2546a24a92b1e7d4d8fa1e1e38aeedb2 (patch) | |
| tree | 09f07fe50e45aeb6a61c67c83cb714a5eca545d7 /drivers/bcma/scan.c | |
| parent | 4f16061ede08b6bea34c4e699c9dfa7ba6c88793 (diff) | |
| parent | ba6e5eb107b4b26444cb67ce6fb8eb0973a97964 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'drivers/bcma/scan.c')
| -rw-r--r-- | drivers/bcma/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c index 0ea390f9aa9e..cad994857683 100644 --- a/drivers/bcma/scan.c +++ b/drivers/bcma/scan.c @@ -281,7 +281,7 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr, /* get & parse master ports */ for (i = 0; i < ports[0]; i++) { - u32 mst_port_d = bcma_erom_get_mst_port(bus, eromptr); + s32 mst_port_d = bcma_erom_get_mst_port(bus, eromptr); if (mst_port_d < 0) return -EILSEQ; } |