From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 16 Sep 2018 20:04:13 +0000 (+0200)
Subject: Merge 4.19-rc4 into staging-next
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7dc074348eb85d48f7a1fa96879458f4becf68a7;p=android-x86%2Fkernel.git

Merge 4.19-rc4 into staging-next

Handle the merge issues and take the iio and staging driver fixes.

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

7dc074348eb85d48f7a1fa96879458f4becf68a7
diff --cc MAINTAINERS
index 1e3e0dfe448a,4ece30f15777..7f77f2c837a8
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5632,7 -5624,10 +5633,9 @@@ F:	Documentation/fault-injection
  F:	lib/fault-inject.c
  
  FBTFT Framebuffer drivers
 -M:	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 +S:	Orphan
+ L:	dri-devel@lists.freedesktop.org
+ L:	linux-fbdev@vger.kernel.org
 -S:	Maintained
  F:	drivers/staging/fbtft/
  
  FC0011 TUNER DRIVER
diff --cc drivers/staging/wilc1000/linux_wlan.c
index 1d8de4dc9cf9,3b8d237decbf..49afda669393
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@@ -1039,11 -1037,9 +1039,11 @@@ void wilc_netdev_cleanup(struct wilc *w
  		}
  	}
  
 +	flush_workqueue(wilc->hif_workqueue);
 +	destroy_workqueue(wilc->hif_workqueue);
  	kfree(wilc);
- 	wilc_debugfs_remove();
  }
+ EXPORT_SYMBOL_GPL(wilc_netdev_cleanup);
  
  static const struct net_device_ops wilc_netdev_ops = {
  	.ndo_init = mac_init_fn,
@@@ -1131,22 -1122,7 +1130,25 @@@ int wilc_netdev_init(struct wilc **wilc
  	}
  
  	return 0;
 +
 +free_ndev:
 +	for (; i >= 0; i--) {
 +		if (wl->vif[i]) {
 +			if (wl->vif[i]->iftype == STATION_MODE)
 +				unregister_netdev(wl->vif[i]->ndev);
 +
 +			if (wl->vif[i]->ndev) {
 +				wilc_free_wiphy(wl->vif[i]->ndev);
 +				free_netdev(wl->vif[i]->ndev);
 +			}
 +		}
 +	}
 +	unregister_inetaddr_notifier(&g_dev_notifier);
 +	destroy_workqueue(wl->hif_workqueue);
 +free_wl:
 +	kfree(wl);
 +	return -ENOMEM;
  }
+ EXPORT_SYMBOL_GPL(wilc_netdev_init);
+ 
+ MODULE_LICENSE("GPL");
diff --cc drivers/staging/wilc1000/wilc_wlan.c
index 6ff3e5861431,8b184aa30d25..590a51c52fd0
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@@ -455,8 -470,9 +456,9 @@@ void chip_wakeup(struct wilc *wilc
  			wilc->hif_func->hif_write_reg(wilc, 0x1e9c, val32);
  		}
  	}
 -	chip_ps_state = CHIP_WAKEDUP;
 +	wilc->chip_ps_state = CHIP_WAKEDUP;
  }
+ EXPORT_SYMBOL_GPL(chip_wakeup);
  
  void wilc_chip_sleep_manually(struct wilc *wilc)
  {
@@@ -467,9 -483,10 +469,10 @@@
  	chip_allow_sleep(wilc);
  	wilc->hif_func->hif_write_reg(wilc, 0x10a8, 1);
  
 -	chip_ps_state = CHIP_SLEEPING_MANUAL;
 +	wilc->chip_ps_state = CHIP_SLEEPING_MANUAL;
  	release_bus(wilc, RELEASE_ONLY);
  }
+ EXPORT_SYMBOL_GPL(wilc_chip_sleep_manually);
  
  void host_wakeup_notify(struct wilc *wilc)
  {