From: Michal Wilczynski <michal.wilczynski@intel.com>
Date: Mon, 3 Jul 2023 08:02:45 +0000 (+0300)
Subject: ACPI: bus: Set driver_data to NULL every time .add() fails
X-Git-Tag: v6.6.17~4116^2~5^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d16710146a10cf62b3efddee8ffd006432d5d7e;p=platform%2Fkernel%2Flinux-rpi.git

ACPI: bus: Set driver_data to NULL every time .add() fails

Most ACPI drivers set driver_data in their .add() callbacks, but usually
they don't clear it in the error code path.

Set driver_data to NULL in acpi_device_probe() to prevent stale pointers
from staying around.

Signed-off-by: Michal Wilczynski <michal.wilczynski@intel.com>
[ rjw: Subject and changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index b568883..0168b3a 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -1029,8 +1029,10 @@ static int acpi_device_probe(struct device *dev)
 		return -ENOSYS;
 
 	ret = acpi_drv->ops.add(acpi_dev);
-	if (ret)
+	if (ret) {
+		acpi_dev->driver_data = NULL;
 		return ret;
+	}
 
 	pr_debug("Driver [%s] successfully bound to device [%s]\n",
 		 acpi_drv->name, acpi_dev->pnp.bus_id);