target/linux/bcm53xx/patches-3.14/140-bcma-only-map-wrap-if-it-is-not-null.patch

   1 From f8ea60bbaf880d8d8d99fde3b5155f472e00141f Mon Sep 17 00:00:00 2001
   2 From: Hauke Mehrtens <hauke@hauke-m.de>
   3 Date: Mon, 12 May 2014 20:16:39 +0200
   4 Subject: [PATCH 09/15] bcma: only map wrap if it is not null
   5
   6 The chipcommon B core does not have a wrap address and it would fail here.
   7
   8 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
   9 ---
  10  drivers/bcma/scan.c | 11 +++++++----
  11  1 file changed, 7 insertions(+), 4 deletions(-)
  12
  13 --- a/drivers/bcma/scan.c
  14 +++ b/drivers/bcma/scan.c
  15 @@ -421,10 +421,13 @@ static int bcma_get_next_core(struct bcm
  16                 core->io_addr = ioremap_nocache(core->addr, BCMA_CORE_SIZE);
  17                 if (!core->io_addr)
  18                         return -ENOMEM;
  19 -               core->io_wrap = ioremap_nocache(core->wrap, BCMA_CORE_SIZE);
  20 -               if (!core->io_wrap) {
  21 -                       iounmap(core->io_addr);
  22 -                       return -ENOMEM;
  23 +               if (core->wrap) {
  24 +                       core->io_wrap = ioremap_nocache(core->wrap,
  25 +                                                       BCMA_CORE_SIZE);
  26 +                       if (!core->io_wrap) {
  27 +                               iounmap(core->io_addr);
  28 +                               return -ENOMEM;
  29 +                       }
  30                 }
  31         }
  32         return 0;