xf86-video-ati: Branch 'master'
Alex Deucher
agd5f at kemper.freedesktop.org
Sat Jan 31 11:21:56 PST 2009
src/radeon_atombios.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 6fac3cefd1f46161c1e276ba40e72da2823aa9f6
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Sat Jan 31 14:21:02 2009 -0500
Return NULL for encoder if no active device is assigned
fixes bug 19855
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 9fe7ec7..61eb62b 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1593,8 +1593,10 @@ radeon_get_encoder(xf86OutputPtr output)
RADEONOutputPrivatePtr radeon_output = output->driver_private;
RADEONInfoPtr info = RADEONPTR(output->scrn);
- return info->encoders[radeon_get_device_index(radeon_output->active_device)];
-
+ if (radeon_output->active_device)
+ return info->encoders[radeon_get_device_index(radeon_output->active_device)];
+ else
+ return NULL;
}
Bool
More information about the xorg-commit
mailing list