Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3fc701d5d459f3b83ba874613048d36e91debca2
Commit:     3fc701d5d459f3b83ba874613048d36e91debca2
Parent:     63213196fd4b05b9c3539cbe34775c60f1f6fad0
Author:     Krzysztof Helt <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 1 21:39:32 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Fri Aug 3 14:08:26 2007 -0700

    [CG6]: fix memory size detection
    
    This patch fixes memory size detection on the CG6 card.
    The 1MB TGX card has dblbuf property set to 0.
    
    Signed-off-by: Krzysztof Helt <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 drivers/video/cg6.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 87c7471..ee9046d 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -677,6 +677,7 @@ static int __devinit cg6_probe(struct of_device *op, const 
struct of_device_id *
        struct fb_info *info;
        struct cg6_par *par;
        int linebytes, err;
+       int dblbuf;
 
        info = framebuffer_alloc(sizeof(struct cg6_par), &op->dev);
 
@@ -698,7 +699,9 @@ static int __devinit cg6_probe(struct of_device *op, const 
struct of_device_id *
        linebytes = of_getintprop_default(dp, "linebytes",
                                          info->var.xres);
        par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);
-       if (of_find_property(dp, "dblbuf", NULL))
+
+       dblbuf = of_getintprop_default(dp, "dblbuf", 0);
+       if (dblbuf)
                par->fbsize *= 4;
 
        par->fbc = of_ioremap(&op->resource[0], CG6_FBC_OFFSET,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to