aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-07-07 20:16:08 +1000
committerDave Airlie <airlied@linux.ie>2005-07-07 20:16:08 +1000
commit0c7b525c344bc29a760c37053f8d5c80292ee1be (patch)
tree9003290ac74732297b0866f89d691f732430c107
parentc101f3136cc98a003d0d16be6fab7d0d950581a6 (diff)
downloadmrst-s0i3-test-0c7b525c344bc29a760c37053f8d5c80292ee1be.tar.gz
mrst-s0i3-test-0c7b525c344bc29a760c37053f8d5c80292ee1be.tar.xz
mrst-s0i3-test-0c7b525c344bc29a760c37053f8d5c80292ee1be.zip
drm: fix minor issues caused by core conversion
The conversion to core/driver got this check in-correct. Signed-off-by: Dave Airlie <airlied@linux.ie>
-rw-r--r--drivers/char/drm/drm_fops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c
index 906794247ae..7f9b00c6d24 100644
--- a/drivers/char/drm/drm_fops.c
+++ b/drivers/char/drm/drm_fops.c
@@ -251,7 +251,7 @@ int drm_release( struct inode *inode, struct file *filp )
}
}
- if (drm_core_check_feature(dev, DRIVER_HAVE_DMA))
+ if (drm_core_check_feature(dev, DRIVER_HAVE_DMA) && !dev->driver->release)
{
dev->driver->reclaim_buffers(dev, filp);
}