3 files changed, 5 insertions, 11 deletions

diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c
index 7db5234462d0..a6f7cc0a0883 100644
--- a/drivers/video/backlight/88pm860x_bl.c
+++ b/drivers/video/backlight/88pm860x_bl.c
@@ -216,7 +216,7 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
         data->reg_duty_cycle = res->start;
         res = platform_get_resource_byname(pdev, IORESOURCE_REG, "always on");
         if (!res) {
-                dev_err(&pdev->dev, "No REG resorce for always on\n");
+                dev_err(&pdev->dev, "No REG resource for always on\n");
                 return -ENXIO;
         }
         data->reg_always_on = res->start;
diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c
index a7b6217ac87b..6ad23bd3523a 100644
--- a/drivers/video/fbdev/amba-clcd.c
+++ b/drivers/video/fbdev/amba-clcd.c
@@ -639,9 +639,7 @@ static int clcdfb_of_init_tft_panel(struct clcd_fb *fb, u32 r0, u32 g0, u32 b0)
                 if (g0 != panels[i].g0)
                         continue;
                 if (r0 == panels[i].r0 && b0 == panels[i].b0)
-                        fb->panel->caps = panels[i].caps & CLCD_CAP_RGB;
-                if (r0 == panels[i].b0 && b0 == panels[i].r0)
-                        fb->panel->caps = panels[i].caps & CLCD_CAP_BGR;
+                        fb->panel->caps = panels[i].caps;
         }
 
         return fb->panel->caps ? 0 : -EINVAL;
diff --git a/drivers/video/fbdev/via/via-gpio.c b/drivers/video/fbdev/via/via-gpio.c
index e408679081ab..6f433b8cee12 100644
--- a/drivers/video/fbdev/via/via-gpio.c
+++ b/drivers/video/fbdev/via/via-gpio.c
@@ -270,7 +270,7 @@ static int viafb_gpio_probe(struct platform_device *platdev)
 static int viafb_gpio_remove(struct platform_device *platdev)
 {
         unsigned long flags;
-        int ret = 0, i;
+        int i;
 
 #ifdef CONFIG_PM
         viafb_pm_unregister(&viafb_gpio_pm_hooks);
@@ -280,11 +280,7 @@ static int viafb_gpio_remove(struct platform_device *platdev)
          * Get unregistered.
          */
         if (viafb_gpio_config.gpio_chip.ngpio > 0) {
-                ret = gpiochip_remove(&viafb_gpio_config.gpio_chip);
-                if (ret) { /* Somebody still using it? */
-                        printk(KERN_ERR "Viafb: GPIO remove failed\n");
-                        return ret;
-                }
+                gpiochip_remove(&viafb_gpio_config.gpio_chip);
         }
         /*
          * Disable the ports.
@@ -294,7 +290,7 @@ static int viafb_gpio_remove(struct platform_device *platdev)
                 viafb_gpio_disable(viafb_gpio_config.active_gpios[i]);
         viafb_gpio_config.gpio_chip.ngpio = 0;
         spin_unlock_irqrestore(&viafb_gpio_config.vdev->reg_lock, flags);
-        return ret;
+        return 0;
 }
 
 static struct platform_driver via_gpio_driver = {