diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-12 19:51:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-12 19:51:43 +0200 |
| commit | 6356bb0ad6525dae93c06478a098ed3848e9ab01 (patch) | |
| tree | 8fdbda28405fb0b1c213f2a87c532a760510adf0 /drivers/gpu/drm/nouveau/nouveau_fbcon.c | |
| parent | 7781544e7c367d0cae87feb0f0675fd333bfc9d8 (diff) | |
| parent | 0ca06c0857aee11911f91621db14498496f2c2cd (diff) | |
| download | linux-stable-6356bb0ad6525dae93c06478a098ed3848e9ab01.tar.gz linux-stable-6356bb0ad6525dae93c06478a098ed3848e9ab01.tar.bz2 linux-stable-6356bb0ad6525dae93c06478a098ed3848e9ab01.zip | |
Merge tag 'please-pull-mce-f-bit' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull MCE-uncorrected-error fix from Tony Luck:
"Bit 12 may or may not be set in MCi_STATUS.MCACOD when
an uncorrected error is reported. Ignore it when checking
error signatures."
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fbcon.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 4c1bc061fae2..8f6d63d7edd3 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -398,7 +398,8 @@ void nouveau_fbcon_output_poll_changed(struct drm_device *dev) { struct nouveau_drm *drm = nouveau_drm(dev); - drm_fb_helper_hotplug_event(&drm->fbcon->helper); + if (drm->fbcon) + drm_fb_helper_hotplug_event(&drm->fbcon->helper); } static int |