Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 03711d00aaae..8218078b6133 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -419,8 +419,9 @@ long drm_ioctl(struct file *filp,
                         retcode = -EFAULT;
                         goto err_i1;
                 }
-        } else
+        } else if (cmd & IOC_OUT) {
                 memset(kdata, 0, usize);
+        }
 
         if (ioctl->flags & DRM_UNLOCKED)
                 retcode = func(dev, kdata, file_priv);