diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2007-01-03 21:54:05 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2007-01-03 21:54:05 -0800 |
| commit | 5a793b0dcf2d5de408b55073858fcfba6d99f994 (patch) | |
| tree | 062de91ac31b128d29ec026090181b1d9b0de82f /src/i830_sdvo.c | |
| parent | f188525030a8fac59e41520449b1aec9b123e4ea (diff) | |
| parent | 394124ceaadb46d976ad5c3bdeb1b77d351c57f6 (diff) | |
Merge branch 'modesetting-origin' into modesetting
Diffstat (limited to 'src/i830_sdvo.c')
| -rw-r--r-- | src/i830_sdvo.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c index b5116be0..19b4b934 100644 --- a/src/i830_sdvo.c +++ b/src/i830_sdvo.c @@ -1207,7 +1207,12 @@ i830_sdvo_init(ScrnInfoPtr pScrn, int output_device) } strcpy (name, name_prefix); strcat (name, name_suffix); - xf86OutputRename (output, name); + if (!xf86OutputRename (output, name)) + { + xf86OutputDestroy (output); + return; + } + /* Set the input timing to the screen. Assume always input 0. */ i830_sdvo_set_target_input(output, TRUE, FALSE); |