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>
This commit is contained in:
parent
661a1021e3
commit
ed38a1469b
@ -1293,7 +1293,6 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
|
|||||||
case CAMSS_660:
|
case CAMSS_660:
|
||||||
vfe->ops = &vfe_ops_4_8;
|
vfe->ops = &vfe_ops_4_8;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CAMSS_845:
|
case CAMSS_845:
|
||||||
vfe->ops = &vfe_ops_170;
|
vfe->ops = &vfe_ops_170;
|
||||||
break;
|
break;
|
||||||
@ -1321,7 +1320,7 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
|
|||||||
|
|
||||||
vfe->irq = r->start;
|
vfe->irq = r->start;
|
||||||
snprintf(vfe->irq_name, sizeof(vfe->irq_name), "%s_%s%d",
|
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,
|
ret = devm_request_irq(dev, vfe->irq, vfe->ops->isr,
|
||||||
IRQF_TRIGGER_RISING, vfe->irq_name, vfe);
|
IRQF_TRIGGER_RISING, vfe->irq_name, vfe);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
|
Loading…
Reference in New Issue
Block a user