Commit:     de74f70360353929009f8611f3bb8fbb4f030527
Parent:     8b03336752e664880182a8f50e1807edc7fe93d4
Author:     Timur Tabi <[EMAIL PROTECTED]>
AuthorDate: Thu Mar 15 09:48:53 2007 -0500
Committer:  Kumar Gala <[EMAIL PROTECTED]>
CommitDate: Mon Mar 26 17:06:22 2007 -0500

    [POWERPC] QE: fix invalid pointer usage in ucc_slow_init()
    In two places, ucc_slow_init() passes a physical address instead of the
    virtual address to functions that were expecting the latter, causing a 
    panic.  us_info->regs contains the physical address of the UCC register set.
    The registers are ioremap'd to kernel space, and the virtual pointers are
    stored in us_regs.  The code was using us_info->regs when it should have 
    using us_regs.
    Signed-off-by: Timur Tabi <[EMAIL PROTECTED]>
    Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
 arch/powerpc/sysdev/qe_lib/ucc_slow.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/sysdev/qe_lib/ucc_slow.c 
index 817df73..b930d68 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc_slow.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc_slow.c
@@ -187,7 +187,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct 
ucc_slow_private ** ucc
        uccs->us_pram = qe_muram_addr(uccs->us_pram_offset);
        /* Init Guemr register */
-       if ((ret = ucc_init_guemr((struct ucc_common *) (us_info->regs)))) {
+       if ((ret = ucc_init_guemr((struct ucc_common *) us_regs))) {
                printk(KERN_ERR "%s: cannot init GUEMR", __FUNCTION__);
                return ret;
@@ -195,7 +195,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct 
ucc_slow_private ** ucc
        /* Set UCC to slow type */
        if ((ret = ucc_set_type(us_info->ucc_num,
-                               (struct ucc_common *) (us_info->regs),
+                               (struct ucc_common *) us_regs,
                                UCC_SPEED_TYPE_SLOW))) {
                printk(KERN_ERR "%s: cannot set UCC type", __FUNCTION__);
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

Reply via email to