History

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

Dave Airlie committed 11 years ago

Commit c6e7e4b2 parents f025705 a1d05031 file · +1 −1Browse files

Unified · Split

drivers/gpu/drm/i2c/adv7511.c+1−1
@@ -438,7 +438,7 @@ static int adv7511_irq_process(struct adv7511 *adv7511) · 437 unmodified lines
438 regmap_write(adv7511->regmap, ADV7511_REG_INT(0), irq0);438 regmap_write(adv7511->regmap, ADV7511_REG_INT(0), irq0);
439 regmap_write(adv7511->regmap, ADV7511_REG_INT(1), irq1);439 regmap_write(adv7511->regmap, ADV7511_REG_INT(1), irq1);
440 440
441 if (irq0 & ADV7511_INT0_HDP)441 if (irq0 & ADV7511_INT0_HDP && adv7511->encoder)
442 drm_helper_hpd_irq_event(adv7511->encoder->dev);442 drm_helper_hpd_irq_event(adv7511->encoder->dev);
443 443
444 if (irq0 & ADV7511_INT0_EDID_READY || irq1 & ADV7511_INT1_DDC_ERROR) {444 if (irq0 & ADV7511_INT0_EDID_READY || irq1 & ADV7511_INT1_DDC_ERROR) {