Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7a6f0b22706e2314dbba91f53d20502050aec1d2

Authored by Laurent Pinchart
Committed by Mauro Carvalho Chehab
1 parent 2d4e9d1db2
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[media] media: Properly handle link flags in link setup, link notify callback 

The link flags were not properly handled in __media_entity_setup_link
which could lead to link_notify callback to be called when the flags are
not modified. Fix this.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 1 changed file with 6 additions and 2 deletions Side-by-side Diff

drivers/media/media-entity.c
Diff comments   View file @ 7a6f0b2
... ... @@ -378,7 +378,6 @@
378 378  
379 379 static int __media_entity_setup_link_notify(struct media_link *link, u32 flags)
380 380 {
381   - const u32 mask = MEDIA_LNK_FL_ENABLED;
382 381 int ret;
383 382  
384 383 /* Notify both entities. */
... ... @@ -395,7 +394,7 @@
395 394 return ret;
396 395 }
397 396  
398   - link->flags = (link->flags & ~mask) | (flags & mask);
  397 + link->flags = flags;
399 398 link->reverse->flags = link->flags;
400 399  
401 400 return 0;
402 401  
... ... @@ -417,11 +416,16 @@
417 416 */
418 417 int __media_entity_setup_link(struct media_link *link, u32 flags)
419 418 {
  419 + const u32 mask = MEDIA_LNK_FL_ENABLED;
420 420 struct media_device *mdev;
421 421 struct media_entity *source, *sink;
422 422 int ret = -EBUSY;
423 423  
424 424 if (link == NULL)
  425 + return -EINVAL;
  426 +
  427 + /* The non-modifiable link flags must not be modified. */
  428 + if ((link->flags & ~mask) != (flags & ~mask))
425 429 return -EINVAL;
426 430  
427 431 if (link->flags & MEDIA_LNK_FL_IMMUTABLE)