diff options
author | Jeffy Chen <jeffy.chen@rock-chips.com> | 2017-02-05 02:55:00 -0500 |
---|---|---|
committer | Mark Yao <mark.yao@rock-chips.com> | 2017-02-05 03:29:58 -0500 |
commit | be0270e4d14656d36e76c098ebe822ca2fc34044 (patch) | |
tree | 9f3464a51682b9176784df29440cbb828e9869b3 | |
parent | 81632df69772efaacc6218281f58d5ed19d5c97e (diff) |
drm/rockchip: cdn-dp: Move mutex_init to probe
We're trying to lock mutex when cdn-dp shutdown, so we need to make
sure the mutex is inited in cdn-dp's probe.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Reviewed-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
-rw-r--r-- | drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c index 62e02a48ebea..799e8260e7c4 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c | |||
@@ -1041,7 +1041,6 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data) | |||
1041 | dp->connected = false; | 1041 | dp->connected = false; |
1042 | dp->active = false; | 1042 | dp->active = false; |
1043 | 1043 | ||
1044 | mutex_init(&dp->lock); | ||
1045 | INIT_WORK(&dp->event_work, cdn_dp_pd_event_work); | 1044 | INIT_WORK(&dp->event_work, cdn_dp_pd_event_work); |
1046 | 1045 | ||
1047 | encoder = &dp->encoder; | 1046 | encoder = &dp->encoder; |
@@ -1204,6 +1203,7 @@ static int cdn_dp_probe(struct platform_device *pdev) | |||
1204 | return -EINVAL; | 1203 | return -EINVAL; |
1205 | } | 1204 | } |
1206 | 1205 | ||
1206 | mutex_init(&dp->lock); | ||
1207 | dev_set_drvdata(dev, dp); | 1207 | dev_set_drvdata(dev, dp); |
1208 | 1208 | ||
1209 | return component_add(dev, &cdn_dp_component_ops); | 1209 | return component_add(dev, &cdn_dp_component_ops); |