drm: merge in Linus mainline

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/char/drm/drm_lock.c b/drivers/char/drm/drm_lock.c
index f970dc36c18f..f9e45303498d 100644
--- a/drivers/char/drm/drm_lock.c
+++ b/drivers/char/drm/drm_lock.c
@@ -104,8 +104,9 @@ int drm_lock(struct inode *inode, struct file *filp,
         __set_current_state(TASK_RUNNING);
         remove_wait_queue(&dev->lock.lock_queue, &entry);
 
-        DRM_DEBUG( "%d %s\n", lock.context, ret ? "interrupted" : "has lock" );
-        if (ret) return ret;
+        DRM_DEBUG("%d %s\n", lock.context, ret ? "interrupted" : "has lock");
+        if (ret)
+                return ret;
 
         sigemptyset(&dev->sigmask);
         sigaddset(&dev->sigmask, SIGSTOP);
@@ -121,17 +122,19 @@ int drm_lock(struct inode *inode, struct file *filp,
 
         if (dev->driver->dma_quiescent && (lock.flags & _DRM_LOCK_QUIESCENT)) {
                 if (dev->driver->dma_quiescent(dev)) {
-                        DRM_DEBUG( "%d waiting for DMA quiescent\n", lock.context);
+                        DRM_DEBUG("%d waiting for DMA quiescent\n", lock.context);
                         return DRM_ERR(EBUSY);
                 }
         }
 
+        /* dev->driver->kernel_context_switch isn't used by any of the x86
+         *  drivers but is used by the Sparc driver.
+         */
         if (dev->driver->kernel_context_switch &&
             dev->last_context != lock.context) {
                 dev->driver->kernel_context_switch(dev, dev->last_context,
                                                    lock.context);
         }
-
         return 0;
 }