1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index f52663ebe016..09a3571c9908 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -274,6 +274,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
                 /* create a new master */
                 priv->minor->master = drm_master_create(priv->minor);
                 if (!priv->minor->master) {
+                        mutex_unlock(&dev->struct_mutex);
                         ret = -ENOMEM;
                         goto out_free;
                 }
@@ -337,14 +338,10 @@ int drm_fasync(int fd, struct file *filp, int on)
 {
         struct drm_file *priv = filp->private_data;
         struct drm_device *dev = priv->minor->dev;
-        int retcode;
 
         DRM_DEBUG("fd = %d, device = 0x%lx\n", fd,
                   (long)old_encode_dev(priv->minor->device));
-        retcode = fasync_helper(fd, filp, on, &dev->buf_async);
-        if (retcode < 0)
-                return retcode;
-        return 0;
+        return fasync_helper(fd, filp, on, &dev->buf_async);
 }
 EXPORT_SYMBOL(drm_fasync);