Commit 3381e2c2 authored by Qiang Yu's avatar Qiang Yu Committed by Adam Jackson

xfree86: fix wrong usage of xf86optionListMerge

Signed-off-by: default avatarQiang Yu <Qiang.Yu@amd.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 10125106)
parent 27a2772c
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment