Merge branch 'memdup_user_nul' into work.misc

[cascardo/linux.git] / drivers / gpu / vga / vgaarb.c

diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index 9abcaa5..f17cb04 100644 (file)
--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -1163,12 +1163,8 @@ done:
 
 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;
 }
@@ -1209,9 +1205,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++) {