diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/atafb.c | 2 | ||||
-rw-r--r-- | drivers/video/q40fb.c | 4 | ||||
-rw-r--r-- | drivers/zorro/zorro.c | 2 |
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, | |||
1718 | (((red & 0xe000) >> 13) | ((red & 0x1000) >> 12) << 8) | | 1718 | (((red & 0xe000) >> 13) | ((red & 0x1000) >> 12) << 8) | |
1719 | (((green & 0xe000) >> 13) | ((green & 0x1000) >> 12) << 4) | | 1719 | (((green & 0xe000) >> 13) | ((green & 0x1000) >> 12) << 4) | |
1720 | ((blue & 0xe000) >> 13) | ((blue & 0x1000) >> 12); | 1720 | ((blue & 0xe000) >> 13) | ((blue & 0x1000) >> 12); |
1721 | #ifdef ATAFB_FALCON | ||
1722 | ((u32 *)info->pseudo_palette)[regno] = ((red & 0xf800) | | 1721 | ((u32 *)info->pseudo_palette)[regno] = ((red & 0xf800) | |
1723 | ((green & 0xfc00) >> 5) | | 1722 | ((green & 0xfc00) >> 5) | |
1724 | ((blue & 0xf800) >> 11)); | 1723 | ((blue & 0xf800) >> 11)); |
1725 | #endif | ||
1726 | } | 1724 | } |
1727 | return 0; | 1725 | return 0; |
1728 | } | 1726 | } |
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 @@ | |||
28 | 28 | ||
29 | #define Q40_PHYS_SCREEN_ADDR 0xFE800000 | 29 | #define Q40_PHYS_SCREEN_ADDR 0xFE800000 |
30 | 30 | ||
31 | static struct fb_fix_screeninfo q40fb_fix __initdata = { | 31 | static struct fb_fix_screeninfo q40fb_fix __devinitdata = { |
32 | .id = "Q40", | 32 | .id = "Q40", |
33 | .smem_len = 1024*1024, | 33 | .smem_len = 1024*1024, |
34 | .type = FB_TYPE_PACKED_PIXELS, | 34 | .type = FB_TYPE_PACKED_PIXELS, |
@@ -37,7 +37,7 @@ static struct fb_fix_screeninfo q40fb_fix __initdata = { | |||
37 | .accel = FB_ACCEL_NONE, | 37 | .accel = FB_ACCEL_NONE, |
38 | }; | 38 | }; |
39 | 39 | ||
40 | static struct fb_var_screeninfo q40fb_var __initdata = { | 40 | static struct fb_var_screeninfo q40fb_var __devinitdata = { |
41 | .xres = 1024, | 41 | .xres = 1024, |
42 | .yres = 512, | 42 | .yres = 512, |
43 | .xres_virtual = 1024, | 43 | .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) | |||
142 | error = device_register(&bus->dev); | 142 | error = device_register(&bus->dev); |
143 | if (error) { | 143 | if (error) { |
144 | pr_err("Zorro: Error registering zorro_bus\n"); | 144 | pr_err("Zorro: Error registering zorro_bus\n"); |
145 | put_device(&bus->dev); | ||
145 | kfree(bus); | 146 | kfree(bus); |
146 | return error; | 147 | return error; |
147 | } | 148 | } |
@@ -175,6 +176,7 @@ static int __init amiga_zorro_probe(struct platform_device *pdev) | |||
175 | if (error) { | 176 | if (error) { |
176 | dev_err(&bus->dev, "Error registering device %s\n", | 177 | dev_err(&bus->dev, "Error registering device %s\n", |
177 | z->name); | 178 | z->name); |
179 | put_device(&z->dev); | ||
178 | continue; | 180 | continue; |
179 | } | 181 | } |
180 | error = zorro_create_sysfs_dev_files(z); | 182 | error = zorro_create_sysfs_dev_files(z); |