diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2014-11-25 18:08:48 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-11-26 12:03:56 -0500 |
| commit | a566059d89139c3c3ce21b0c7cb37886b2549b78 (patch) | |
| tree | 214596307bff603745f011d812aed068240843d3 /drivers/net/dsa/bcm_sf2.c | |
| parent | tg3: fix ring init when there are more TX than RX channels (diff) | |
| download | linux-dev-a566059d89139c3c3ce21b0c7cb37886b2549b78.tar.xz linux-dev-a566059d89139c3c3ce21b0c7cb37886b2549b78.zip | |
net: dsa: bcm_sf2: fix unmapping registers in case of errors
In case we fail to ioremap() one of our registers, we would be leaking
existing mappings, unwind those accordingly on errors.
Fixes: 246d7f773c13 ("net: dsa: add Broadcom SF2 switch driver")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/dsa/bcm_sf2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index b9625968daac..46632e8b6336 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -404,7 +404,8 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds) *base = of_iomap(dn, i); if (*base == NULL) { pr_err("unable to find register: %s\n", reg_names[i]); - return -ENODEV; + ret = -ENOMEM; + goto out_unmap; } base++; } @@ -484,7 +485,8 @@ out_free_irq0: out_unmap: base = &priv->core; for (i = 0; i < BCM_SF2_REGS_NUM; i++) { - iounmap(*base); + if (*base) + iounmap(*base); base++; } return ret; |