diff options
Diffstat (limited to 'drivers/video/cyberfb.c')
-rw-r--r-- | drivers/video/cyberfb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/cyberfb.c b/drivers/video/cyberfb.c index c40e72dafb0e..0b8d5b121152 100644 --- a/drivers/video/cyberfb.c +++ b/drivers/video/cyberfb.c | |||
@@ -109,8 +109,6 @@ static void cv64_dump(void); | |||
109 | #define wb_64(regs,reg,dat) (*(((volatile unsigned char *)regs) + reg) = dat) | 109 | #define wb_64(regs,reg,dat) (*(((volatile unsigned char *)regs) + reg) = dat) |
110 | #define rb_64(regs, reg) (*(((volatile unsigned char *)regs) + reg)) | 110 | #define rb_64(regs, reg) (*(((volatile unsigned char *)regs) + reg)) |
111 | 111 | ||
112 | #define ww_64(regs,reg,dat) (*((volatile unsigned short *)(regs + reg) = dat) | ||
113 | |||
114 | struct cyberfb_par { | 112 | struct cyberfb_par { |
115 | struct fb_var_screeninfo var; | 113 | struct fb_var_screeninfo var; |
116 | __u32 type; | 114 | __u32 type; |
@@ -1055,6 +1053,8 @@ int __init cyberfb_init(void) | |||
1055 | 1053 | ||
1056 | if (register_framebuffer(&fb_info) < 0) { | 1054 | if (register_framebuffer(&fb_info) < 0) { |
1057 | DPRINTK("EXIT - register_framebuffer failed\n"); | 1055 | DPRINTK("EXIT - register_framebuffer failed\n"); |
1056 | if (CyberBase) | ||
1057 | iounmap(CyberBase); | ||
1058 | release_mem_region(CyberMem_phys, 0x400000); | 1058 | release_mem_region(CyberMem_phys, 0x400000); |
1059 | release_mem_region(CyberRegs_phys, 0x10000); | 1059 | release_mem_region(CyberRegs_phys, 0x10000); |
1060 | return -EINVAL; | 1060 | return -EINVAL; |