Merge 3.8-rc5 into driver-core-next
Greg Kroah-Hartman [Sat, 26 Jan 2013 05:06:30 +0000 (21:06 -0800)]
This resolves a gpio driver merge issue pointed out in linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1  2 
drivers/cpufreq/Kconfig.x86
drivers/dma/imx-dma.c
drivers/dma/tegra20-apb-dma.c
drivers/gpio/gpio-mvebu.c
drivers/i2c/busses/i2c-omap.c
drivers/i2c/busses/i2c-sirf.c
drivers/media/platform/s5p-mfc/s5p_mfc.c
drivers/staging/iio/adc/mxs-lradc.c
drivers/usb/host/ehci-mxc.c

Simple merge
Simple merge
Simple merge
@@@ -545,11 -544,11 +545,9 @@@ static int mvebu_gpio_probe(struct plat
        mvchip->chip.of_node = np;
  
        spin_lock_init(&mvchip->lock);
 -      mvchip->membase = devm_request_and_ioremap(&pdev->dev, res);
 -      if (! mvchip->membase) {
 -              dev_err(&pdev->dev, "Cannot ioremap\n");
 -              return -ENOMEM;
 -      }
 +      mvchip->membase = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(mvchip->membase)) {
-               kfree(mvchip->chip.label);
++      if (IS_ERR(mvchip->membase))
 +              return PTR_ERR(mvchip->membase);
-       }
  
        /* The Armada XP has a second range of registers for the
         * per-CPU registers */
                        return -ENODEV;
                }
  
 -              mvchip->percpu_membase = devm_request_and_ioremap(&pdev->dev, res);
 -              if (! mvchip->percpu_membase) {
 -                      dev_err(&pdev->dev, "Cannot ioremap\n");
 -                      return -ENOMEM;
 -              }
 +              mvchip->percpu_membase = devm_ioremap_resource(&pdev->dev,
 +                                                             res);
-               if (IS_ERR(mvchip->percpu_membase)) {
-                       kfree(mvchip->chip.label);
++              if (IS_ERR(mvchip->percpu_membase)) 
 +                      return PTR_ERR(mvchip->percpu_membase);
-               }
        }
  
        /*
Simple merge
Simple merge
Simple merge
Simple merge