Commit 10125106 authored by Qiang Yu's avatar Qiang Yu Committed by Peter Hutterer

xfree86: fix wrong usage of xf86optionListMerge

Signed-off-by: default avatarQiang Yu <>
Reviewed-by: default avatarHans de Goede <>
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <>
parent e473b2bc
......@@ -87,7 +87,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);
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