From: Mauro Carvalho Chehab Date: Mon, 7 Mar 2022 15:43:02 +0000 (+0100) Subject: Merge tag 'for-5.18-2.6-signed' of git://linuxtv.org/sailus/media_tree into media_stage X-Git-Tag: microblaze-v5.19~159^2~82 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=12fdba564afd1f80eeaeed55c1c81761addda161;p=linux-2.6-microblaze.git Merge tag 'for-5.18-2.6-signed' of git://linuxtv.org/sailus/media_tree into media_stage Even yet more V4L2 patches for 5.18 * tag 'for-5.18-2.6-signed' of git://linuxtv.org/sailus/media_tree: media: i2c: Fix pixel array positions in ov8865 media: adv7183: Convert to GPIO descriptors media: m5mols: Convert to use GPIO descriptors media: noon010p30: Convert to use GPIO descriptors media: mt9m111: Drop unused include media: adv7511: Drop unused include media: i2c: isl7998x: Add driver for Intersil ISL7998x media: dt-bindings: Add Intersil ISL79987 DT bindings media: media-entity: Clarify media_entity_cleanup() usage media: i2c: imx274: Drop surplus includes media: i2c: ccs: Drop unused include v4l: fwnode: Remove now-redundant loop from v4l2_fwnode_parse_reference() v4l: fwnode: Drop redunant -ENODATA check in property reference parsing media: media-entity: Simplify media_pipeline_start() media: media-entity: Add media_pad_is_streaming() helper function media: Add a driver for the og01a1b camera sensor media: i2c: ov5648: Fix lockdep error media: ov5640: Fix set format, v4l2_mbus_pixelcode not updated Signed-off-by: Mauro Carvalho Chehab --- 12fdba564afd1f80eeaeed55c1c81761addda161 diff --cc drivers/media/platform/rcar-vin/rcar-core.c index 58b002693b7d,5117a7a3b5ec..64cb05b3907c --- a/drivers/media/platform/rcar-vin/rcar-core.c +++ b/drivers/media/platform/rcar-vin/rcar-core.c @@@ -793,9 -816,11 +793,9 @@@ static int rvin_csi2_link_notify(struc * running streams. */ media_device_for_each_entity(entity, &group->mdev) - if (entity->stream_count) + if (media_entity_is_streaming(entity)) return -EBUSY; - mutex_lock(&group->lock); - /* Find the master VIN that controls the routes. */ vdev = media_entity_to_video_device(link->sink->entity); vin = container_of(vdev, struct rvin_dev, vdev);