diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-10-25 14:33:47 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-10-25 14:33:47 +0000 |
commit | dca633f1c8441e0c3f47662c1dc51e29f0c0fa94 (patch) | |
tree | 27e003a7e97a51f3e46207657be07de2c205e910 /target/linux/generic/patches-3.3/027-bcma-add-missing-iounmap-on-error-path.patch | |
parent | f911fb32feca42396c09ebf0042b99e207cd7c48 (diff) | |
download | upstream-dca633f1c8441e0c3f47662c1dc51e29f0c0fa94.tar.gz upstream-dca633f1c8441e0c3f47662c1dc51e29f0c0fa94.tar.bz2 upstream-dca633f1c8441e0c3f47662c1dc51e29f0c0fa94.zip |
kernel: update bcma and ssb to master-2012-10-18 from wireless-testing
* update the flash driver for bcm47xx to use the stubs already in bcma
* do some misc enhancements to the flash drivers for bcm47xx
SVN-Revision: 33920
Diffstat (limited to 'target/linux/generic/patches-3.3/027-bcma-add-missing-iounmap-on-error-path.patch')
-rw-r--r-- | target/linux/generic/patches-3.3/027-bcma-add-missing-iounmap-on-error-path.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/target/linux/generic/patches-3.3/027-bcma-add-missing-iounmap-on-error-path.patch b/target/linux/generic/patches-3.3/027-bcma-add-missing-iounmap-on-error-path.patch deleted file mode 100644 index dc8367b6c5..0000000000 --- a/target/linux/generic/patches-3.3/027-bcma-add-missing-iounmap-on-error-path.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/drivers/bcma/scan.c -+++ b/drivers/bcma/scan.c -@@ -462,8 +462,10 @@ int bcma_bus_scan(struct bcma_bus *bus) - while (eromptr < eromend) { - struct bcma_device *other_core; - struct bcma_device *core = kzalloc(sizeof(*core), GFP_KERNEL); -- if (!core) -- return -ENOMEM; -+ if (!core) { -+ err = -ENOMEM; -+ goto out; -+ } - INIT_LIST_HEAD(&core->list); - core->bus = bus; - -@@ -478,7 +480,7 @@ int bcma_bus_scan(struct bcma_bus *bus) - } else if (err == -ESPIPE) { - break; - } -- return err; -+ goto out; - } - - core->core_index = core_num++; -@@ -494,10 +496,12 @@ int bcma_bus_scan(struct bcma_bus *bus) - list_add_tail(&core->list, &bus->cores); - } - -+ err = 0; -+out: - if (bus->hosttype == BCMA_HOSTTYPE_SOC) - iounmap(eromptr); - -- return 0; -+ return err; - } - - int __init bcma_bus_scan_early(struct bcma_bus *bus, -@@ -537,7 +541,7 @@ int __init bcma_bus_scan_early(struct bc - else if (err == -ESPIPE) - break; - else if (err < 0) -- return err; -+ goto out; - - core->core_index = core_num++; - bus->nr_cores++; -@@ -551,6 +555,7 @@ int __init bcma_bus_scan_early(struct bc - break; - } - -+out: - if (bus->hosttype == BCMA_HOSTTYPE_SOC) - iounmap(eromptr); - |