diff options
Diffstat (limited to 'drivers/video/efifb.c')
-rw-r--r-- | drivers/video/efifb.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c index ecf405562f5c..4a56f46af40a 100644 --- a/drivers/video/efifb.c +++ b/drivers/video/efifb.c | |||
@@ -168,7 +168,7 @@ static void efifb_destroy(struct fb_info *info) | |||
168 | { | 168 | { |
169 | if (info->screen_base) | 169 | if (info->screen_base) |
170 | iounmap(info->screen_base); | 170 | iounmap(info->screen_base); |
171 | release_mem_region(info->aperture_base, info->aperture_size); | 171 | release_mem_region(info->apertures->ranges[0].base, info->apertures->ranges[0].size); |
172 | framebuffer_release(info); | 172 | framebuffer_release(info); |
173 | } | 173 | } |
174 | 174 | ||
@@ -292,8 +292,13 @@ static int __devinit efifb_probe(struct platform_device *dev) | |||
292 | info->pseudo_palette = info->par; | 292 | info->pseudo_palette = info->par; |
293 | info->par = NULL; | 293 | info->par = NULL; |
294 | 294 | ||
295 | info->aperture_base = efifb_fix.smem_start; | 295 | info->apertures = alloc_apertures(1); |
296 | info->aperture_size = size_remap; | 296 | if (!info->apertures) { |
297 | err = -ENOMEM; | ||
298 | goto err_release_fb; | ||
299 | } | ||
300 | info->apertures->ranges[0].base = efifb_fix.smem_start; | ||
301 | info->apertures->ranges[0].size = size_remap; | ||
297 | 302 | ||
298 | info->screen_base = ioremap(efifb_fix.smem_start, efifb_fix.smem_len); | 303 | info->screen_base = ioremap(efifb_fix.smem_start, efifb_fix.smem_len); |
299 | if (!info->screen_base) { | 304 | if (!info->screen_base) { |