git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming
[pandora-kernel.git]
/
drivers
/
video
/
bfin-t350mcqb-fb.c
diff --git
a/drivers/video/bfin-t350mcqb-fb.c
b/drivers/video/bfin-t350mcqb-fb.c
index
44e49c2
..
c2ec3dc
100644
(file)
--- 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)
fbinfo->fbops = &bfin_t350mcqb_fb_ops;
fbinfo->flags = FBINFO_FLAG_DEFAULT;
fbinfo->fbops = &bfin_t350mcqb_fb_ops;
fbinfo->flags = FBINFO_FLAG_DEFAULT;
- info->fb_buffer =
-
dma_alloc_coherent(NULL, fbinfo->fix.smem_len, &info->dma_handle
,
- GFP_KERNEL);
+ info->fb_buffer =
dma_alloc_coherent(NULL, fbinfo->fix.smem_len +
+
ACTIVE_VIDEO_MEM_OFFSET
,
+
&info->dma_handle,
GFP_KERNEL);
if (NULL == info->fb_buffer) {
printk(KERN_ERR DRIVER_NAME
if (NULL == info->fb_buffer) {
printk(KERN_ERR DRIVER_NAME
@@
-568,8
+568,8
@@
out7:
out6:
fb_dealloc_cmap(&fbinfo->cmap);
out4:
out6:
fb_dealloc_cmap(&fbinfo->cmap);
out4:
- dma_free_coherent(NULL, fbinfo->fix.smem_len
, info->fb_buffer
,
- info->dma_handle);
+ dma_free_coherent(NULL, fbinfo->fix.smem_len
+ ACTIVE_VIDEO_MEM_OFFSET
,
+
info->fb_buffer,
info->dma_handle);
out3:
framebuffer_release(fbinfo);
out2:
out3:
framebuffer_release(fbinfo);
out2:
@@
-592,8
+592,9
@@
static int __devexit bfin_t350mcqb_remove(struct platform_device *pdev)
free_irq(info->irq, info);
if (info->fb_buffer != NULL)
free_irq(info->irq, info);
if (info->fb_buffer != NULL)
- dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
- info->dma_handle);
+ dma_free_coherent(NULL, fbinfo->fix.smem_len +
+ ACTIVE_VIDEO_MEM_OFFSET, info->fb_buffer,
+ info->dma_handle);
fb_dealloc_cmap(&fbinfo->cmap);
fb_dealloc_cmap(&fbinfo->cmap);