frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Qiang Yu 2017-01-10 18:51:54 +08:00 committed by Peter Hutterer
parent e473b2bc01
commit 1012510620
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/xf86Option.c
View File

@ -87,7 +87,7 @@ xf86CollectOptions(ScrnInfoPtr pScrn, XF86OptionPtr extraOpts)
if (device && device->options) { if (device && device->options) {
tmp = xf86optionListDup(device->options); tmp = xf86optionListDup(device->options);
if (pScrn->options) if (pScrn->options)
xf86optionListMerge(pScrn->options, tmp); pScrn->options = xf86optionListMerge(pScrn->options, tmp);
else else
pScrn->options = tmp; pScrn->options = tmp;
} }