From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 10 Dec 2018 05:14:07 +0000 (+1100)
Subject: Merge remote-tracking branch 'driver-core/driver-core-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=50cb4421d18eac9222cf4fa29ecedfa7a00cb509;p=users%2Fwilly%2Flinux.git

Merge remote-tracking branch 'driver-core/driver-core-next'
---

50cb4421d18eac9222cf4fa29ecedfa7a00cb509
diff --cc drivers/base/platform.c
index 0fb5f140f1b0,e1ba610482c0..2c36bf490944
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@@ -447,7 -447,8 +447,7 @@@ void platform_device_del(struct platfor
  {
  	int i;
  
- 	if (pdev) {
+ 	if (!IS_ERR_OR_NULL(pdev)) {
 -		device_remove_properties(&pdev->dev);
  		device_del(&pdev->dev);
  
  		if (pdev->id_auto) {