[PATCH xserver 1/4] xfree86: fix wrong usage of xf86optionListMerge

[Hans de Goede]

Hi,

On 10-01-17 11:51, Qiang Yu wrote:
> Signed-off-by: Qiang Yu <Qiang.Yu at amd.com>

Patch looks good to me:

Reviewed-by: Hans de Goede <hdegoede at redhat.com>

Regards,

Hans


> ---
>  hw/xfree86/common/xf86Option.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c
> index 929724d..06973bc 100644
> --- a/hw/xfree86/common/xf86Option.c
> +++ b/hw/xfree86/common/xf86Option.c
> @@ -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);
>              else
>                  pScrn->options = tmp;
>          }
>