From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 26 Jan 2013 05:06:30 +0000 (-0800)
Subject: Merge 3.8-rc5 into driver-core-next
X-Git-Tag: upstream/snapshot3+hdmi~5697^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=422d26b6ecd77af8c77f2a40580679459825170f;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge 3.8-rc5 into driver-core-next

This resolves a gpio driver merge issue pointed out in linux-next.

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

422d26b6ecd77af8c77f2a40580679459825170f
diff --cc drivers/gpio/gpio-mvebu.c
index bf6c7c9,6819d63..7472182
--- a/drivers/gpio/gpio-mvebu.c
+++ b/drivers/gpio/gpio-mvebu.c
@@@ -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 */
@@@ -560,13 -559,11 +558,10 @@@
  			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);
- 		}
  	}
  
  	/*