Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfbf53ed authored by Al Viro's avatar Al Viro
Browse files

vgaarb: remove bogus checks 



neither ->release() nor ->poll() can be called unless ->open()
has succeeded on the same struct file, so checking for "has
open() failed" is pointless.  What's more, ->poll() doesn't
return -E... - it always returns a bitmap of POLL... values,
so the dead code in that one had been actively bogus.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 03927c8a

drivers/gpu/vga/vgaarb.c

+0 −7
Original line number Diff line number Diff line
@@ -1161,12 +1161,8 @@ static ssize_t vga_arb_write(struct file *file, const char __user *buf, 


static unsigned int vga_arb_fpoll(struct file *file, poll_table *wait)

{

	struct vga_arb_private *priv = file->private_data;



	pr_debug("%s\n", __func__);



	if (priv == NULL)

		return -ENODEV;

	poll_wait(file, &vga_wait_queue, wait);

	return POLLIN;

}
@@ -1207,9 +1203,6 @@ static int vga_arb_release(struct inode *inode, struct file *file) 


	pr_debug("%s\n", __func__);



	if (priv == NULL)

		return -ENODEV;



	spin_lock_irqsave(&vga_user_lock, flags);

	list_del(&priv->list);

	for (i = 0; i < MAX_USER_CARDS; i++) {