Skip to content

Commit 7297ff8

Browse files
jhovoldgouravk-qualcomm
authored andcommitted
BACKPORT: media: venus: drop bogus probe deferrals
The encoder and decoder platform devices are registered by the venus driver as children of the venus device, but even if someone were to mess this up no amount of probe deferring is going to conjure up a parent. Relatedly, the venus driver sets its driver data before registering the child devices and if this ever breaks we want to learn about it by failing probe. Signed-off-by: Johan Hovold <johan@kernel.org> Reviewed-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com> Reviewed-by: Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Signed-off-by: Bryan O'Donoghue <bod@kernel.org> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org> Link: https://lore.kernel.org/all/20251017055809.8037-1-johan@kernel.org/ (cherry picked from commit 6e971cf)
1 parent 214d94e commit 7297ff8

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

drivers/media/platform/qcom/venus/vdec.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1784,12 +1784,9 @@ static int vdec_probe(struct platform_device *pdev)
17841784
struct venus_core *core;
17851785
int ret;
17861786

1787-
if (!dev->parent)
1788-
return -EPROBE_DEFER;
1789-
17901787
core = dev_get_drvdata(dev->parent);
17911788
if (!core)
1792-
return -EPROBE_DEFER;
1789+
return -EINVAL;
17931790

17941791
platform_set_drvdata(pdev, core);
17951792

drivers/media/platform/qcom/venus/venc.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,12 +1560,9 @@ static int venc_probe(struct platform_device *pdev)
15601560
struct venus_core *core;
15611561
int ret;
15621562

1563-
if (!dev->parent)
1564-
return -EPROBE_DEFER;
1565-
15661563
core = dev_get_drvdata(dev->parent);
15671564
if (!core)
1568-
return -EPROBE_DEFER;
1565+
return -EINVAL;
15691566

15701567
platform_set_drvdata(pdev, core);
15711568

0 commit comments

Comments
 (0)