From 34173a4aad7a641e72b70f9927ca797746fbce69 Mon Sep 17 00:00:00 2001 From: Miguel Ojeda Date: Tue, 20 Feb 2007 13:58:00 -0800 Subject: [PATCH] cfag12864b: fix crash when built-in and no parport present The problem comes when ks0108/cfag12864b are built-in and no parallel port is present. ks0108_init() is called first, as it should be, but fails to load (as there is no parallel port to use). After that, cfag12864b_init() gets called, without knowing anything about ks0108 failed, and calls ks0108_writecontrol(), which dereferences an uninitialized pointer. Init order is OK, I think. The problem is how to stop cfag12864b_init() being called if ks0108 failed to load. modprobe does it for us, but, how when built-in? Signed-off-by: Miguel Ojeda Sandonis Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/linux/cfag12864b.h | 5 +++++ include/linux/ks0108.h | 3 +++ 2 files changed, 8 insertions(+) (limited to 'include') diff --git a/include/linux/cfag12864b.h b/include/linux/cfag12864b.h index 0bc45e69da5..1605dd8aa64 100644 --- a/include/linux/cfag12864b.h +++ b/include/linux/cfag12864b.h @@ -73,5 +73,10 @@ extern void cfag12864b_disable(void); */ extern unsigned char cfag12864b_isenabled(void); +/* + * Is the module inited? + */ +extern unsigned char cfag12864b_isinited(void); + #endif /* _CFAG12864B_H_ */ diff --git a/include/linux/ks0108.h b/include/linux/ks0108.h index 8047d4b17bf..a2c54acceb4 100644 --- a/include/linux/ks0108.h +++ b/include/linux/ks0108.h @@ -43,4 +43,7 @@ extern void ks0108_address(unsigned char address); /* Set the controller's current page (0..7) */ extern void ks0108_page(unsigned char page); +/* Is the module inited? */ +extern unsigned char ks0108_isinited(void); + #endif /* _KS0108_H_ */ -- cgit v1.2.3