very similar, now in walnut_setup_arch(); arch/ppc/platforms/4xx/walnut.c
PATCH 1/1 very similar, now in walnut_setup_arch(); arch/ppc/platforms/4xx/walnut.c
iounmap kb_data on error
Signed-off-by Roel Kluin <[email protected]>
---
arch/ppc/platforms/4xx/walnut.c +1 -0
@@ -81,22 +81,23 @@ walnut_setup_arch(void) kb_data =ioremap (WALNUT_PS2_BASE ,8 );if (!kb_data) {printk (KERN_CRIT "walnut_setup_arch() kb_data ioremap failed\n" );return ; } kb_cs = kb_data +1 ; fpga_status =ioremap (PPC40x_FPGA_BASE,8 );if (!fpga_status) { +iounmap (kb_data);printk (KERN_CRIT "walnut_setup_arch() fpga_status ioremap failed\n" );return ; } fpga_enable = fpga_status +1 ; fpga_polarity = fpga_status +2 ; fpga_trigger = fpga_status +3 ; fpga_brdc = fpga_status +4 ;/* split the keyboard and mouse interrupts */
Quoted 15 lines · On Wed, 07 Nov 2007 23:17:30 +0100 Roel Kluin <[email protected]> wrote:
iounmap
kb_dataon errorSigned-off-by Roel Kluin <[email protected]>---
arch/ppc/platforms/4xx/walnut.c +0
-0@@ -81,22 +81,23 @@ walnut_setup_arch(void) kb_data =ioremap (WALNUT_PS2_BASE ,8 );if (!kb_data) {printk (KERN_CRIT "walnut_setup_arch() kb_data ioremap failed\n" );return ; }
arch/ppc/platforms/4xx/walnut.c walnut_setup_arch(void) · line 96
Quoted 10 lines
arch/ppc/platforms/4xx/walnut.c +1
-0kb_cs = kb_data +1 ; fpga_status =ioremap (PPC40x_FPGA_BASE,8 );if (!fpga_status) { +iounmap (kb_data);printk (KERN_CRIT "walnut_setup_arch() fpga_status ioremap failed\n" );return ; }
kb_data and fpga_status aren't iounmapped anywhere at all in this function. Care to fix that up in addition to the error case?
Quoted 11 lines
arch/ppc/platforms/4xx/walnut.c +0
-0fpga_enable = fpga_status +1 ; fpga_polarity = fpga_status +2 ; fpga_trigger = fpga_status +3 ; fpga_brdc = fpga_status +4 ;/* split the keyboard and mouse interrupts */ _______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev