media: camss: vfe: Don't call hw_version() before its dependencies are met
Subsystems (4)
PATCH v2 1/1 media: camss: vfe: Don't call hw_version() before its dependencies are met
vfe->ops->hw_version(vfe) is being called before vfe->base has been assigned, and before the hardware has been powered up.
--- drivers/media/platform/qcom/camss/camss-vfe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/platform/qcom/camss/camss-vfe.c +2 -1
@@ -604,6 +604,8 @@ static int vfe_get(struct vfe_device *vfe)vfe_reset_output_maps (vfe);vfe_init_outputs (vfe); + + vfe->ops->hw_version (vfe); }else { ret =vfe_check_clock_rates (vfe);if (ret <0 )
@@ -1299,7 +1301,6 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,return -EINVAL ; } vfe->ops->subdev_init (dev, vfe); - vfe->ops->hw_version (vfe);/* Memory */
Signature · 1 line
2.30.2
Quoted 8 lines · Robert Foss
vfe->ops->hw_version(vfe)is being called beforevfe->basehas been assigned, and before the hardware has been powered up.Fixes b10b5334528a9 ("media: camss: vfe: Don't read hardware version needlessly")Reported-by Marek Szyprowski <[email protected]>Signed-off-by Robert Foss <[email protected]>
Quoted 18 lines
--- drivers/media/platform/qcom/camss/camss-vfe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/media/platform/qcom/camss/camss-vfe.c +2
-0@@ -604,6 +604,8 @@ static int vfe_get(struct vfe_device *vfe)vfe_reset_output_maps (vfe);vfe_init_outputs (vfe); + + vfe->ops->hw_version (vfe); }else { ret =vfe_check_clock_rates (vfe);if (ret <0 )
drivers/media/platform/qcom/camss/camss-vfe.c int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe, · line 1306
Quoted 7 lines
drivers/media/platform/qcom/camss/camss-vfe.c +0
-1@@ -1299,7 +1301,6 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,return -EINVAL ; } vfe->ops->subdev_init (dev, vfe); - vfe->ops->hw_version (vfe);/* Memory */
Best regards
Signature · 2 lines
Marek Szyprowski, PhD Samsung R&D Institute Poland
Marek Szyprowski
Reviewed-byQuoted 11 lines · Marek Szyprowski
Quoted 9 lines · Robert Foss
vfe->ops->hw_version(vfe)is being called beforevfe->basehas been assigned, and before the hardware has been powered up.Fixes b10b5334528a9 ("media: camss: vfe: Don't read hardware versionneedlessly")
Reported-by Marek Szyprowski <[email protected]>Signed-off-by Robert Foss <[email protected]>Tested-by Marek Szyprowski <[email protected]>
This restores old, well tested code path.
Quoted 18 lines
Quoted 18 lines
---
drivers/media/platform/qcom/camss/camss-vfe.c| 3 ++-1 file changed, 2 insertions(+), 1 deletion(-)drivers/media/platform/qcom/camss/camss-vfe.c +2
-0@@ -604,6 +604,8 @@ static int vfe_get(struct vfe_device *vfe) vfe_reset_output_maps(vfe); vfe_init_outputs(vfe); + + vfe->ops->hw_version(vfe); } else { ret = vfe_check_clock_rates(vfe); if (ret < 0)@@ -1299,7 +1301,6 @@ int msm_vfe_subdev_init(struct camss *camss,
Quoted 8 lines
drivers/media/platform/qcom/camss/camss-vfe.c int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe, · line 1305
Quoted 6 lines
drivers/media/platform/qcom/camss/camss-vfe.c +0
-1struct vfe_device *vfe, return -EINVAL; } vfe->ops->subdev_init(dev, vfe); - vfe->ops->hw_version(vfe); /* Memory */Best regards
Best regards
Signature · 2 lines
Marek Szyprowski, PhD Samsung R&D Institute Poland