From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Oct 2012 19:10:44 +0000 (-0700)
Subject: Merge tag 'driver-core-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: upstream/snapshot3+hdmi~6594
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06d2fe153b9b35e57221e35831a26918f462db68;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge tag 'driver-core-3.6' of git://git./linux/kernel/git/gregkh/driver-core

Pull driver core merge from Greg Kroah-Hartman:
 "Here is the big driver core update for 3.7-rc1.

  A number of firmware_class.c updates (as you saw a month or so ago),
  and some hyper-v updates and some printk fixes as well.  All patches
  that are outside of the drivers/base area have been acked by the
  respective maintainers, and have all been in the linux-next tree for a
  while.

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

* tag 'driver-core-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (95 commits)
  memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl()
  device.h: Add missing inline to #ifndef CONFIG_PRINTK dev_vprintk_emit
  memory: emif: Add ifdef CONFIG_DEBUG_FS guard for emif_debugfs_[init|exit]
  Documentation: Fixes some translation error in Documentation/zh_CN/gpio.txt
  Documentation: Remove 3 byte redundant code at the head of the Documentation/zh_CN/arm/booting
  Documentation: Chinese translation of Documentation/video4linux/omap3isp.txt
  device and dynamic_debug: Use dev_vprintk_emit and dev_printk_emit
  dev: Add dev_vprintk_emit and dev_printk_emit
  netdev_printk/netif_printk: Remove a superfluous logging colon
  netdev_printk/dynamic_netdev_dbg: Directly call printk_emit
  dev_dbg/dynamic_debug: Update to use printk_emit, optimize stack
  driver-core: Shut up dev_dbg_reatelimited() without DEBUG
  tools/hv: Parse /etc/os-release
  tools/hv: Check for read/write errors
  tools/hv: Fix exit() error code
  tools/hv: Fix file handle leak
  Tools: hv: Implement the KVP verb - KVP_OP_GET_IP_INFO
  Tools: hv: Rename the function kvp_get_ip_address()
  Tools: hv: Implement the KVP verb - KVP_OP_SET_IP_INFO
  Tools: hv: Add an example script to configure an interface
  ...
---

06d2fe153b9b35e57221e35831a26918f462db68
diff --cc drivers/extcon/extcon-arizona.c
index 6c19833,dc81d5f..cdab9e5
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@@ -434,15 -483,18 +483,23 @@@ static int __devinit arizona_extcon_pro
  	regmap_update_bits(arizona->regmap, ARIZONA_JACK_DETECT_ANALOGUE,
  			   ARIZONA_JD1_ENA, ARIZONA_JD1_ENA);
  
 +	ret = regulator_allow_bypass(info->micvdd, true);
 +	if (ret != 0)
 +		dev_warn(arizona->dev, "Failed to set MICVDD to bypass: %d\n",
 +			 ret);
 +
  	pm_runtime_put(&pdev->dev);
  
+ 	ret = input_register_device(info->input);
+ 	if (ret) {
+ 		dev_err(&pdev->dev, "Can't register input device: %d\n", ret);
+ 		goto err_micdet;
+ 	}
+ 
  	return 0;
  
+ err_micdet:
+ 	arizona_free_irq(arizona, ARIZONA_IRQ_MICDET, info);
  err_fall_wake:
  	arizona_set_irq_wake(arizona, ARIZONA_IRQ_JD_FALL, 0);
  err_fall: