vserver 2.0 rc7

[linux-2.6.git] / drivers / video / pxafb.c

diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 552a38e..815fbc8 100644 (file)
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -942,7 +942,7 @@ pxafb_freq_policy(struct notifier_block *nb, unsigned long val, void *data)
  * Power management hooks.  Note that we won't be called from IRQ context,
  * unlike the blank functions above, so we may sleep.
  */
-static int pxafb_suspend(struct device *dev, u32 state, u32 level)
+static int pxafb_suspend(struct device *dev, pm_message_t state, u32 level)
 {
        struct pxafb_info *fbi = dev_get_drvdata(dev);
 
@@ -1343,8 +1343,7 @@ int __init pxafb_probe(struct device *dev)
 
 failed:
        dev_set_drvdata(dev, NULL);
-       if (fbi)
-               kfree(fbi);
+       kfree(fbi);
        return ret;
 }