Commit ed38a146 authored by Jonathan Marek's avatar Jonathan Marek Committed by Mauro Carvalho Chehab
Browse files

media: camss: fix VFE irq name 



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

Signed-off-by: default avatarJonathan Marek <jonathan@marek.ca>
Reviewed-by: default avatarRobert Foss <robert.foss@linaro.org>
Tested-by: default avatarJulian Grahsl <jgrahsl@snap.com>
Tested-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 661a1021

drivers/media/platform/qcom/camss/camss-vfe.c

+1 −2
Original line number Diff line number Diff line
@@ -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) {