drm: fix crash with fops lock and fixup sarea/page size locking

[deliverable/linux.git] / drivers / char / drm / ffb_drv.c

diff --git a/drivers/char/drm/ffb_drv.c b/drivers/char/drm/ffb_drv.c
index 5c121d6df9f2d4139d4ae76a7451bd6e826da216..9a19879e3b688fa7f3924bad6e624846148dc7be 100644 (file)
--- a/drivers/char/drm/ffb_drv.c
+++ b/drivers/char/drm/ffb_drv.c
@@ -4,13 +4,11 @@
  * Copyright (C) 2000 David S. Miller (davem@redhat.com)
  */
 
-#include <linux/config.h>
 #include "ffb.h"
 #include "drmP.h"
 
 #include "ffb_drv.h"
 
-#include <linux/sched.h>
 #include <linux/smp_lock.h>
 #include <asm/shmparam.h>
 #include <asm/oplib.h>
@@ -245,14 +243,12 @@ static void ffb_driver_release(drm_device_t * dev, struct file *filp)
 
 static void ffb_driver_pretakedown(drm_device_t * dev)
 {
-       if (dev->dev_private)
-               kfree(dev->dev_private);
+       kfree(dev->dev_private);
 }
 
 static int ffb_driver_postcleanup(drm_device_t * dev)
 {
-       if (ffb_position != NULL)
-               kfree(ffb_position);
+       kfree(ffb_position);
        return 0;
 }