3 files changed, 4 insertions, 4 deletions

diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index f3aada20fa02..5b2b5ef4edba 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -1718,11 +1718,9 @@ static int falcon_setcolreg(unsigned int regno, unsigned int red,
                         (((red & 0xe000) >> 13) | ((red & 0x1000) >> 12) << 8) |
                         (((green & 0xe000) >> 13) | ((green & 0x1000) >> 12) << 4) |
                         ((blue & 0xe000) >> 13) | ((blue & 0x1000) >> 12);
-#ifdef ATAFB_FALCON
                 ((u32 *)info->pseudo_palette)[regno] = ((red & 0xf800) |
                                                        ((green & 0xfc00) >> 5) |
                                                        ((blue & 0xf800) >> 11));
-#endif
         }
         return 0;
 }
diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index fc32c323a381..f5a39f5aa900 100644
--- a/drivers/video/q40fb.c
+++ b/drivers/video/q40fb.c
@@ -28,7 +28,7 @@
 
 #define Q40_PHYS_SCREEN_ADDR 0xFE800000
 
-static struct fb_fix_screeninfo q40fb_fix __initdata = {
+static struct fb_fix_screeninfo q40fb_fix __devinitdata = {
         .id             = "Q40",
         .smem_len       = 1024*1024,
         .type           = FB_TYPE_PACKED_PIXELS,
@@ -37,7 +37,7 @@ static struct fb_fix_screeninfo q40fb_fix __initdata = {
         .accel          = FB_ACCEL_NONE,
 };
 
-static struct fb_var_screeninfo q40fb_var __initdata = {
+static struct fb_var_screeninfo q40fb_var __devinitdata = {
         .xres           = 1024,
         .yres           = 512,
         .xres_virtual   = 1024,
diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c
index 6455f3a244c5..e0c2807b0970 100644
--- a/drivers/zorro/zorro.c
+++ b/drivers/zorro/zorro.c
@@ -142,6 +142,7 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
         error = device_register(&bus->dev);
         if (error) {
                 pr_err("Zorro: Error registering zorro_bus\n");
+                put_device(&bus->dev);
                 kfree(bus);
                 return error;
         }
@@ -175,6 +176,7 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
                 if (error) {
                         dev_err(&bus->dev, "Error registering device %s\n",
                                 z->name);
+                        put_device(&z->dev);
                         continue;
                 }
                 error = zorro_create_sysfs_dev_files(z);