On Wed, Aug 12, 2015 at 04:32:05PM +0200, Thierry Reding wrote:
> From: Thierry Reding <treding@xxxxxxxxxx>
>
> Some setups do not register a default VGA device, in which case the VGA
> arbiter will still complain about the (non-existent) PCI device being a
> non-VGA device.
>
> Fix this by making the error message conditional on a default VGA device
> having been set up. Note that the easy route of erroring out early isn't
> going to work because otherwise priv->target won't be properly updated.
>
> Signed-off-by: Thierry Reding <treding@xxxxxxxxxx>
Merged them all into drm-misc, thanks.
-Daniel
> ---
> drivers/gpu/vga/vgaarb.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
> index 7bcbf863656e..3b1e65b3d454 100644
> --- a/drivers/gpu/vga/vgaarb.c
> +++ b/drivers/gpu/vga/vgaarb.c
> @@ -1091,8 +1091,11 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf,
> vgadev = vgadev_find(pdev);
> pr_debug("vgaarb: vgadev %p\n", vgadev);
> if (vgadev == NULL) {
> - pr_err("vgaarb: this pci device is not a vga device\n");
> - pci_dev_put(pdev);
> + if (pdev) {
> + pr_err("vgaarb: this pci device is not a vga device\n");
> + pci_dev_put(pdev);
> + }
> +
> ret_val = -ENODEV;
> goto done;
> }
> --
> 2.4.5
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
