media: camss: fix VFE irq name

vfe->id isn't set yet, so use "id" instead here.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Robert Foss <robert.foss@linaro.org>
Tested-by: Julian Grahsl <jgrahsl@snap.com>
Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
index 71f78b40e7f55a2840f9cf3d529ad3c664c36f6a..165b404761db5b2fd327f96fd6b8cb97d98f6667 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe.c
@@ -1293,7 +1293,6 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
        case CAMSS_660:
                vfe->ops = &vfe_ops_4_8;
                break;
-
        case CAMSS_845:
                vfe->ops = &vfe_ops_170;
                break;
@@ -1321,7 +1320,7 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
 
        vfe->irq = r->start;
        snprintf(vfe->irq_name, sizeof(vfe->irq_name), "%s_%s%d",
-                dev_name(dev), MSM_VFE_NAME, vfe->id);
+                dev_name(dev), MSM_VFE_NAME, id);
        ret = devm_request_irq(dev, vfe->irq, vfe->ops->isr,
                               IRQF_TRIGGER_RISING, vfe->irq_name, vfe);
        if (ret < 0) {