diff options
| author | Grant Likely | 2012-02-28 20:48:58 +0100 |
|---|---|---|
| committer | Grant Likely | 2012-02-28 20:48:58 +0100 |
| commit | b3950d50cfc343b3e7dc5c69c96a61b182fd1e37 (patch) | |
| tree | d54affae2b1e25464493b48aa88cd8d6b4770812 /drivers/ssb | |
| parent | Merge branch 'for_3.4/gpio/runtime-pm-cleanup' of git://git.kernel.org/pub/sc... (diff) | |
| parent | mfd: twl-core: Add IRQ_DOMAIN dependency (diff) | |
| download | kernel-qcow2-linux-b3950d50cfc343b3e7dc5c69c96a61b182fd1e37.tar.gz kernel-qcow2-linux-b3950d50cfc343b3e7dc5c69c96a61b182fd1e37.tar.xz kernel-qcow2-linux-b3950d50cfc343b3e7dc5c69c96a61b182fd1e37.zip | |
Merge branch 'irqdomain/next' into gpio/next
Diffstat (limited to 'drivers/ssb')
| -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) { |