From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Apr 2015 00:37:33 +0000 (-0700)
Subject: Merge tag 'staging-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b79013b2449c23f1f505bdf39c5a6c330338b244;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge tag 'staging-4.1-rc1' of git://git./linux/kernel/git/gregkh/staging

Pull staging driver updates from Greg KH:
 "Here's the big staging driver patchset for 4.1-rc1.

  There's a lot of patches here, the Outreachy application period
  happened during this development cycle, so that means that there was a
  lot of cleanup patches accepted.  Other than the normal coding style
  and sparse fixes here, there are some driver updates and work toward
  making some of the drivers into "mergable" shape (like the Unisys
  drivers.)

  All of these have been in linux-next for a while"

* tag 'staging-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1214 commits)
  staging: lustre: orthography & coding style
  staging: lustre: lnet: lnet: fix error return code
  staging: lustre: fix sparse warning
  Revert "Staging: sm750fb: Fix C99 Comments"
  Staging: rtl8192u: use correct array for debug output
  staging: rtl8192e: Remove dead code
  staging: rtl8192e: Comment cleanup (style/format)
  staging: rtl8192e: Fix indentation in rtllib_rx_auth_resp()
  staging: rtl8192e: Decrease nesting of rtllib_rx_auth_resp()
  staging: rtl8192e: Divide rtllib_rx_auth()
  staging: rtl8192e: Fix PRINTK_WITHOUT_KERN_LEVEL warnings
  staging: rtl8192e: Fix DO_WHILE_MACRO_WITH_TRAILING_SEMICOLON warning
  staging: rtl8192e: Fix BRACES warning
  staging: rtl8192e: Fix LINE_CONTINUATIONS warning
  staging: rtl8192e: Fix UNNECESSARY_PARENTHESES warnings
  staging: rtl8192e: remove unused EXPORT_SYMBOL_RSL macro
  staging: rtl8192e: Fix RETURN_VOID warnings
  staging: rtl8192e: Fix UNNECESSARY_ELSE warning
  staging: rtl8723au: Remove unneeded comments
  staging: rtl8723au: Use __func__ in trace logs
  ...
---

b79013b2449c23f1f505bdf39c5a6c330338b244
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);