aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/auxdisplay/cfag12864bfb.c
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 /drivers/auxdisplay/cfag12864bfb.c
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 'drivers/auxdisplay/cfag12864bfb.c')
-rw-r--r--drivers/auxdisplay/cfag12864bfb.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/auxdisplay/cfag12864bfb.c b/drivers/auxdisplay/cfag12864bfb.c
index 94765e78315f..66fafbb1d087 100644
--- a/drivers/auxdisplay/cfag12864bfb.c
+++ b/drivers/auxdisplay/cfag12864bfb.c
@@ -137,7 +137,14 @@ static struct platform_device *cfag12864bfb_device;
137 137
138static int __init cfag12864bfb_init(void) 138static int __init cfag12864bfb_init(void)
139{ 139{
140 int ret; 140 int ret = -EINVAL;
141
142 /* cfag12864b_init() must be called first */
143 if (!cfag12864b_isinited()) {
144 printk(KERN_ERR CFAG12864BFB_NAME ": ERROR: "
145 "cfag12864b is not initialized\n");
146 goto none;
147 }
141 148
142 if (cfag12864b_enable()) { 149 if (cfag12864b_enable()) {
143 printk(KERN_ERR CFAG12864BFB_NAME ": ERROR: " 150 printk(KERN_ERR CFAG12864BFB_NAME ": ERROR: "
@@ -162,6 +169,7 @@ static int __init cfag12864bfb_init(void)
162 } 169 }
163 } 170 }
164 171
172none:
165 return ret; 173 return ret;
166} 174}
167 175