Commit eb6944f2 authored by Thierry Reding's avatar Thierry Reding Committed by Daniel Vetter

vgaarb: Stop complaining about absent devices

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: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 84524917
...@@ -1091,8 +1091,11 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf, ...@@ -1091,8 +1091,11 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf,
vgadev = vgadev_find(pdev); vgadev = vgadev_find(pdev);
pr_debug("vgaarb: vgadev %p\n", vgadev); pr_debug("vgaarb: vgadev %p\n", vgadev);
if (vgadev == NULL) { if (vgadev == NULL) {
pr_err("vgaarb: this pci device is not a vga device\n"); if (pdev) {
pci_dev_put(pdev); pr_err("vgaarb: this pci device is not a vga device\n");
pci_dev_put(pdev);
}
ret_val = -ENODEV; ret_val = -ENODEV;
goto done; goto done;
} }
......
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