diff options
author | Thierry Reding <treding@nvidia.com> | 2014-12-18 15:06:56 +0100 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2015-01-23 12:07:01 +0100 |
commit | 38d98de4332fcdaa72fc83443c1e3268e4b2214b (patch) | |
tree | bb473fa1e2005bdc790daee18ef9dad5053ea39c /drivers/gpu/host1x | |
parent | 536e1715226c94037df12f7c6280cbe0f6009f92 (diff) | |
download | linux-stable-38d98de4332fcdaa72fc83443c1e3268e4b2214b.tar.gz linux-stable-38d98de4332fcdaa72fc83443c1e3268e4b2214b.tar.bz2 linux-stable-38d98de4332fcdaa72fc83443c1e3268e4b2214b.zip |
gpu: host1x: Call host1x_device_add() under lock
Instead of locking within host1x_device_add(), call it under the lock to
make the locking more consistent.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/host1x')
-rw-r--r-- | drivers/gpu/host1x/bus.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index e4182e68e29c..769116dba797 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -323,9 +323,7 @@ static int host1x_device_add(struct host1x *host1x, return err; } - mutex_lock(&host1x->devices_lock); list_add_tail(&device->list, &host1x->devices); - mutex_unlock(&host1x->devices_lock); mutex_lock(&clients_lock); @@ -414,11 +412,11 @@ static void host1x_attach_driver(struct host1x *host1x, } } - mutex_unlock(&host1x->devices_lock); - err = host1x_device_add(host1x, driver); if (err < 0) dev_err(host1x->dev, "failed to allocate device: %d\n", err); + + mutex_unlock(&host1x->devices_lock); } static void host1x_detach_driver(struct host1x *host1x, |