aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMiguel Ojeda <maxextreme@gmail.com>2007-02-20 16:58:00 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-20 20:10:14 -0500
commit34173a4aad7a641e72b70f9927ca797746fbce69 (patch)
treee09d2fd33dc6e14d4b76210e471c47e8fed7b2a1 /include
parente627432c2948d500669a6c4522f22b66f5118d64 (diff)
[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 <maxextreme@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/cfag12864b.h5
-rw-r--r--include/linux/ks0108.h3
2 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/cfag12864b.h b/include/linux/cfag12864b.h
index 0bc45e69da5a..1605dd8aa646 100644
--- a/include/linux/cfag12864b.h
+++ b/include/linux/cfag12864b.h
@@ -73,5 +73,10 @@ extern void cfag12864b_disable(void);
73 */ 73 */
74extern unsigned char cfag12864b_isenabled(void); 74extern unsigned char cfag12864b_isenabled(void);
75 75
76/*
77 * Is the module inited?
78 */
79extern unsigned char cfag12864b_isinited(void);
80
76#endif /* _CFAG12864B_H_ */ 81#endif /* _CFAG12864B_H_ */
77 82
diff --git a/include/linux/ks0108.h b/include/linux/ks0108.h
index 8047d4b17bf1..a2c54acceb4e 100644
--- a/include/linux/ks0108.h
+++ b/include/linux/ks0108.h
@@ -43,4 +43,7 @@ extern void ks0108_address(unsigned char address);
43/* Set the controller's current page (0..7) */ 43/* Set the controller's current page (0..7) */
44extern void ks0108_page(unsigned char page); 44extern void ks0108_page(unsigned char page);
45 45
46/* Is the module inited? */
47extern unsigned char ks0108_isinited(void);
48
46#endif /* _KS0108_H_ */ 49#endif /* _KS0108_H_ */