diff options
| -rw-r--r-- | drivers/video/bfin-t350mcqb-fb.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c index 44e49c28b2a7..c2ec3dcd4e91 100644 --- a/drivers/video/bfin-t350mcqb-fb.c +++ b/drivers/video/bfin-t350mcqb-fb.c | |||
| @@ -488,9 +488,9 @@ static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev) | |||
| 488 | fbinfo->fbops = &bfin_t350mcqb_fb_ops; | 488 | fbinfo->fbops = &bfin_t350mcqb_fb_ops; |
| 489 | fbinfo->flags = FBINFO_FLAG_DEFAULT; | 489 | fbinfo->flags = FBINFO_FLAG_DEFAULT; |
| 490 | 490 | ||
| 491 | info->fb_buffer = | 491 | info->fb_buffer = dma_alloc_coherent(NULL, fbinfo->fix.smem_len + |
| 492 | dma_alloc_coherent(NULL, fbinfo->fix.smem_len, &info->dma_handle, | 492 | ACTIVE_VIDEO_MEM_OFFSET, |
| 493 | GFP_KERNEL); | 493 | &info->dma_handle, GFP_KERNEL); |
| 494 | 494 | ||
| 495 | if (NULL == info->fb_buffer) { | 495 | if (NULL == info->fb_buffer) { |
| 496 | printk(KERN_ERR DRIVER_NAME | 496 | printk(KERN_ERR DRIVER_NAME |
| @@ -568,8 +568,8 @@ out7: | |||
| 568 | out6: | 568 | out6: |
| 569 | fb_dealloc_cmap(&fbinfo->cmap); | 569 | fb_dealloc_cmap(&fbinfo->cmap); |
| 570 | out4: | 570 | out4: |
| 571 | dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer, | 571 | dma_free_coherent(NULL, fbinfo->fix.smem_len + ACTIVE_VIDEO_MEM_OFFSET, |
| 572 | info->dma_handle); | 572 | info->fb_buffer, info->dma_handle); |
| 573 | out3: | 573 | out3: |
| 574 | framebuffer_release(fbinfo); | 574 | framebuffer_release(fbinfo); |
| 575 | out2: | 575 | out2: |
| @@ -592,8 +592,9 @@ static int __devexit bfin_t350mcqb_remove(struct platform_device *pdev) | |||
| 592 | free_irq(info->irq, info); | 592 | free_irq(info->irq, info); |
| 593 | 593 | ||
| 594 | if (info->fb_buffer != NULL) | 594 | if (info->fb_buffer != NULL) |
| 595 | dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer, | 595 | dma_free_coherent(NULL, fbinfo->fix.smem_len + |
| 596 | info->dma_handle); | 596 | ACTIVE_VIDEO_MEM_OFFSET, info->fb_buffer, |
| 597 | info->dma_handle); | ||
| 597 | 598 | ||
| 598 | fb_dealloc_cmap(&fbinfo->cmap); | 599 | fb_dealloc_cmap(&fbinfo->cmap); |
| 599 | 600 | ||
