diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-09-03 03:23:41 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-09-03 03:23:41 -0400 |
commit | ae1ad26388228048db6a5f1056bd569ed2bbc4ec (patch) | |
tree | 223f50677aa00eb6f2a6529099a1005c7e43c071 /drivers/media/v4l2-core/v4l2-subdev.c | |
parent | c84b82dd3e593db217f23c60f7edae02c76a3c4c (diff) | |
parent | 089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff) |
Merge tag 'v5.3-rc7' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-subdev.c')
-rw-r--r-- | drivers/media/v4l2-core/v4l2-subdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index 21fb90d66bfc..25c73c13cc7e 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c | |||
@@ -124,7 +124,7 @@ static inline int check_which(__u32 which) | |||
124 | static inline int check_pad(struct v4l2_subdev *sd, __u32 pad) | 124 | static inline int check_pad(struct v4l2_subdev *sd, __u32 pad) |
125 | { | 125 | { |
126 | #if defined(CONFIG_MEDIA_CONTROLLER) | 126 | #if defined(CONFIG_MEDIA_CONTROLLER) |
127 | if (sd->entity.graph_obj.mdev) { | 127 | if (sd->entity.num_pads) { |
128 | if (pad >= sd->entity.num_pads) | 128 | if (pad >= sd->entity.num_pads) |
129 | return -EINVAL; | 129 | return -EINVAL; |
130 | return 0; | 130 | return 0; |