diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-05-26 16:20:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-05-26 16:20:26 +1000 |
| commit | c6e7e4bb7ff988e7f915526a80ea866d84aac720 (patch) | |
| tree | e7abc6fb52e7be32cf75aecf822f58f3dfd0a7d5 | |
| parent | f025705e738f6124e5f6a737e9a7c67d31a13a48 (diff) | |
| parent | a1d0503d26ea2ef04f3f013d379e8f4d29c27127 (diff) | |
| download | op-kernel-dev-c6e7e4bb7ff988e7f915526a80ea866d84aac720.zip op-kernel-dev-c6e7e4bb7ff988e7f915526a80ea866d84aac720.tar.gz | |
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
| -rw-r--r-- | drivers/gpu/drm/i2c/adv7511.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i2c/adv7511.c b/drivers/gpu/drm/i2c/adv7511.c index b728523..2aaa3c8 100644 --- a/drivers/gpu/drm/i2c/adv7511.c +++ b/drivers/gpu/drm/i2c/adv7511.c @@ -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(1), irq1); - if (irq0 & ADV7511_INT0_HDP) + if (irq0 & ADV7511_INT0_HDP && adv7511->encoder) drm_helper_hpd_irq_event(adv7511->encoder->dev); if (irq0 & ADV7511_INT0_EDID_READY || irq1 & ADV7511_INT1_DDC_ERROR) { |
