Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/video/display/display-sysfs.c b/drivers/video/display/display-sysfs.c
index 4830b1bf51e5..f6a09ab0dac6 100644
--- a/drivers/video/display/display-sysfs.c
+++ b/drivers/video/display/display-sysfs.c
@@ -27,6 +27,7 @@
 #include <linux/idr.h>
 #include <linux/err.h>
 #include <linux/kdev_t.h>
+#include <linux/slab.h>
 
 static ssize_t display_show_name(struct device *dev,
                                 struct device_attribute *attr, char *buf)
@@ -67,7 +68,7 @@ static ssize_t display_store_contrast(struct device *dev,
         contrast = simple_strtoul(buf, &endp, 0);
         size = endp - buf;
 
-        if (*endp && isspace(*endp))
+        if (isspace(*endp))
                 size++;
 
         if (size != count)