diff options
| author | Qiang Yu <Qiang.Yu@amd.com> | 2017-01-10 18:51:54 +0800 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2017-01-11 15:04:12 -0500 |
| commit | 3381e2c26b2ac40b1dd909439bf72559b80d0d86 (patch) | |
| tree | 6499b4a6fcf2aca34bb9a710223c3b83dc8cd533 /hw/xfree86 | |
| parent | 27a2772cf3a1bcd656efdf653a7504597911dbc4 (diff) | |
xfree86: fix wrong usage of xf86optionListMerge
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 1012510620de7dadd0ab18b19a8e11facd884601)
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/common/xf86Option.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c index 0e8bc1f83..e9393fa16 100644 --- a/hw/xfree86/common/xf86Option.c +++ b/hw/xfree86/common/xf86Option.c @@ -84,7 +84,7 @@ xf86CollectOptions(ScrnInfoPtr pScrn, XF86OptionPtr extraOpts) if (device && device->options) { tmp = xf86optionListDup(device->options); if (pScrn->options) - xf86optionListMerge(pScrn->options, tmp); + pScrn->options = xf86optionListMerge(pScrn->options, tmp); else pScrn->options = tmp; } |