aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/host1x
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2014-11-05 11:43:26 +0100
committerThierry Reding <treding@nvidia.com>2015-01-23 12:07:00 +0100
commit536e1715226c94037df12f7c6280cbe0f6009f92 (patch)
tree142cc1db3c1d1cb714d6c14b3217764475636bc9 /drivers/gpu/host1x
parent281d1bbd34b734e4f22b30b6f3b673dda46a7470 (diff)
downloadlinux-stericsson-536e1715226c94037df12f7c6280cbe0f6009f92.tar.gz
gpu: host1x: Call ->remove() only when a device is bound
When a driver's ->probe() function fails, the host1x bus must not call its ->remove() function because the driver will already have cleaned up in the error handling path in ->probe(). Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/host1x')
-rw-r--r--drivers/gpu/host1x/bus.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c
index aaf54859adb0..e4182e68e29c 100644
--- a/drivers/gpu/host1x/bus.c
+++ b/drivers/gpu/host1x/bus.c
@@ -116,7 +116,10 @@ static void host1x_subdev_register(struct host1x_device *device,
if (list_empty(&device->subdevs)) {
err = device->driver->probe(device);
if (err < 0)
- dev_err(&device->dev, "probe failed: %d\n", err);
+ dev_err(&device->dev, "probe failed for %ps: %d\n",
+ device->driver, err);
+ else
+ device->bound = true;
}
}
@@ -130,10 +133,12 @@ static void __host1x_subdev_unregister(struct host1x_device *device,
* If all subdevices have been activated, we're about to remove the
* first active subdevice, so unload the driver first.
*/
- if (list_empty(&device->subdevs)) {
+ if (list_empty(&device->subdevs) && device->bound) {
err = device->driver->remove(device);
if (err < 0)
dev_err(&device->dev, "remove failed: %d\n", err);
+
+ device->bound = false;
}
/*