diff options
| author |   Dafna Hirschfeld <dafna.hirschfeld@collabora.com> | 2020-02-04 22:44:44 +0100 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-02-24 17:33:42 +0100 |
| commit | fdab089e3150d92b2409994fdc32350dbfefab85 (patch) | |
| tree | d996dce9259a86c553b198416ee3c12231fce5e4 /drivers/staging/media/rkisp1/rkisp1-dev.c | |
| parent | media: mc-entity.c: use WARN_ON, validate link pads (diff) | |
| download | wireguard-linux-fdab089e3150d92b2409994fdc32350dbfefab85.tar.xz wireguard-linux-fdab089e3150d92b2409994fdc32350dbfefab85.zip | |
media: staging: rkisp1: don't lock media's graph_mutex when calling rkisp1_create_links
The function rkisp1_create_links calls media_entity_get_fwnode_pad
and media_create_pad_link in the mc api. Those calls don't require
locking the graph_mutex so remove the locking.
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/staging/media/rkisp1/rkisp1-dev.c')
| -rw-r--r-- | drivers/staging/media/rkisp1/rkisp1-dev.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c index 4030d5e71af1..275310d69ca1 100644 --- a/drivers/staging/media/rkisp1/rkisp1-dev.c +++ b/drivers/staging/media/rkisp1/rkisp1-dev.c @@ -220,19 +220,17 @@ static int rkisp1_subdev_notifier_complete(struct v4l2_async_notifier *notifier) container_of(notifier, struct rkisp1_device, notifier); int ret; - mutex_lock(&rkisp1->media_dev.graph_mutex); ret = rkisp1_create_links(rkisp1); if (ret) - goto unlock; + return ret; + ret = v4l2_device_register_subdev_nodes(&rkisp1->v4l2_dev); if (ret) - goto unlock; + return ret; dev_dbg(rkisp1->dev, "Async subdev notifier completed\n"); -unlock: - mutex_unlock(&rkisp1->media_dev.graph_mutex); - return ret; + return 0; } static int rkisp1_fwnode_parse(struct device *dev, |