From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 9 Apr 2015 07:08:15 +0000 (+1000)
Subject: Merge remote-tracking branch 'staging/staging-next'
X-Git-Tag: KARO-TXA5-2015-06-26~37
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=89b50ed9f0ed566d983a9897ab3efe42053e42b1

Merge remote-tracking branch 'staging/staging-next'

Conflicts:
	drivers/staging/media/mn88473/mn88473.c
---

89b50ed9f0ed566d983a9897ab3efe42053e42b1
diff --cc drivers/staging/nvec/nvec_power.c
index 30b66c3c9b73,3621b661aba8..04a7402ae2df
--- a/drivers/staging/nvec/nvec_power.c
+++ b/drivers/staging/nvec/nvec_power.c
@@@ -371,14 -373,12 +371,14 @@@ static void nvec_power_poll(struct work
  
  static int nvec_power_probe(struct platform_device *pdev)
  {
 -	struct power_supply *psy;
 +	struct power_supply **psy;
 +	const struct power_supply_desc *psy_desc;
  	struct nvec_power *power;
  	struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
 +	struct power_supply_config psy_cfg = {};
  
  	power = devm_kzalloc(&pdev->dev, sizeof(struct nvec_power), GFP_NOWAIT);
- 	if (power == NULL)
+ 	if (!power)
  		return -ENOMEM;
  
  	dev_set_drvdata(&pdev->dev, power);