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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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 11 years ago c6e7e4bb f025705e

+1 -1

1 changed file

expand all

drivers

gpu

drm

i2c

adv7511.c

+1 -1

drivers/gpu/drm/i2c/adv7511.c

··· 438 438 regmap_write(adv7511->regmap, ADV7511_REG_INT(0), irq0); 439 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 442 drm_helper_hpd_irq_event(adv7511->encoder->dev); 443 443 444 444 if (irq0 & ADV7511_INT0_EDID_READY || irq1 & ADV7511_INT1_DDC_ERROR) {