Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6e7e4bb authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm/next/adv7511' of git://linuxtv.org/pinchartl/fbdev into drm-next 

adv7511 fix.

* 'drm/next/adv7511' of git://linuxtv.org/pinchartl/fbdev:
  drm: adv7511: Fix crash in IRQ handler when no encoder is associated
parents f025705e a1d0503d

drivers/gpu/drm/i2c/adv7511.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -438,7 +438,7 @@ static int adv7511_irq_process(struct adv7511 *adv7511) 
	regmap_write(adv7511->regmap, ADV7511_REG_INT(0), irq0);

	regmap_write(adv7511->regmap, ADV7511_REG_INT(0), irq0);

	regmap_write(adv7511->regmap, ADV7511_REG_INT(1), irq1);

	regmap_write(adv7511->regmap, ADV7511_REG_INT(1), irq1);





	if (irq0 & ADV7511_INT0_HDP)

	if (irq0 & ADV7511_INT0_HDP && adv7511->encoder)

		drm_helper_hpd_irq_event(adv7511->encoder->dev);

		drm_helper_hpd_irq_event(adv7511->encoder->dev);





	if (irq0 & ADV7511_INT0_EDID_READY || irq1 & ADV7511_INT1_DDC_ERROR) {

	if (irq0 & ADV7511_INT0_EDID_READY || irq1 & ADV7511_INT1_DDC_ERROR) {