diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-03 14:14:07 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-03 14:14:07 -0500 |
| commit | 157ca9eae92bc5247f93bea4ecb50dfacc283a04 (patch) | |
| tree | 2bf88c36d1a7513c3dbb2babd6feb64ed2ce558c /drivers/ssb/driver_pcicore.c | |
| parent | 29830406415c227a54af429d7b300aabd4754237 (diff) | |
| parent | 07ae2dfcf4f7143ce191c6436da1c33f179af0d6 (diff) | |
| download | linux-stable-157ca9eae92bc5247f93bea4ecb50dfacc283a04.tar.gz linux-stable-157ca9eae92bc5247f93bea4ecb50dfacc283a04.tar.bz2 linux-stable-157ca9eae92bc5247f93bea4ecb50dfacc283a04.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/ssb/driver_pcicore.c')
| -rw-r--r-- | drivers/ssb/driver_pcicore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c index 520e8286db28..49d209173f55 100644 --- a/drivers/ssb/driver_pcicore.c +++ b/drivers/ssb/driver_pcicore.c @@ -75,7 +75,7 @@ static u32 get_cfgspace_addr(struct ssb_pcicore *pc, u32 tmp; /* We do only have one cardbus device behind the bridge. */ - if (pc->cardbusmode && (dev >= 1)) + if (pc->cardbusmode && (dev > 1)) goto out; if (bus == 0) { |