mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
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>
This commit is contained in:
committed by
Hans Verkuil
parent
416acb41d4
commit
6e971cfe62
@@ -1776,12 +1776,9 @@ static int vdec_probe(struct platform_device *pdev)
|
||||
struct venus_core *core;
|
||||
int ret;
|
||||
|
||||
if (!dev->parent)
|
||||
return -EPROBE_DEFER;
|
||||
|
||||
core = dev_get_drvdata(dev->parent);
|
||||
if (!core)
|
||||
return -EPROBE_DEFER;
|
||||
return -EINVAL;
|
||||
|
||||
platform_set_drvdata(pdev, core);
|
||||
|
||||
|
||||
@@ -1558,12 +1558,9 @@ static int venc_probe(struct platform_device *pdev)
|
||||
struct venus_core *core;
|
||||
int ret;
|
||||
|
||||
if (!dev->parent)
|
||||
return -EPROBE_DEFER;
|
||||
|
||||
core = dev_get_drvdata(dev->parent);
|
||||
if (!core)
|
||||
return -EPROBE_DEFER;
|
||||
return -EINVAL;
|
||||
|
||||
platform_set_drvdata(pdev, core);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user