diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-08-28 15:56:11 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-28 15:56:11 +1000 |
| commit | 35438c4327df18dbf5e7f597b69299119f4a14de (patch) | |
| tree | a4589d731015db93f2eba8f84ffb1f48a8084020 /drivers/video/cg3.c | |
| parent | 2f6c9d961081dc7b109eb19166244bcb2a5dfc28 (diff) | |
| parent | b07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff) | |
| download | linux-35438c4327df18dbf5e7f597b69299119f4a14de.tar.gz linux-35438c4327df18dbf5e7f597b69299119f4a14de.tar.bz2 linux-35438c4327df18dbf5e7f597b69299119f4a14de.zip | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'drivers/video/cg3.c')
| -rw-r--r-- | drivers/video/cg3.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c index 5741b46ade1b..a5c7fb331527 100644 --- a/drivers/video/cg3.c +++ b/drivers/video/cg3.c @@ -315,7 +315,7 @@ static u_char cg3_dacvals[] __devinitdata = { 4, 0xff, 5, 0x00, 6, 0x70, 7, 0x00, 0 }; -static void __devinit cg3_do_default_mode(struct cg3_par *par) +static int __devinit cg3_do_default_mode(struct cg3_par *par) { enum cg3_type type; u8 *p; @@ -332,10 +332,9 @@ static void __devinit cg3_do_default_mode(struct cg3_par *par) else type = CG3_AT_66HZ; } else { - prom_printf("cgthree: can't handle SR %02x\n", - status); - prom_halt(); - return; + printk(KERN_ERR "cgthree: can't handle SR %02x\n", + status); + return -EINVAL; } } @@ -351,6 +350,7 @@ static void __devinit cg3_do_default_mode(struct cg3_par *par) regp = (u8 __iomem *)&par->regs->cmap.control; sbus_writeb(p[1], regp); } + return 0; } static int __devinit cg3_probe(struct of_device *op, @@ -400,8 +400,11 @@ static int __devinit cg3_probe(struct of_device *op, cg3_blank(0, info); - if (!of_find_property(dp, "width", NULL)) - cg3_do_default_mode(par); + if (!of_find_property(dp, "width", NULL)) { + err = cg3_do_default_mode(par); + if (err) + goto out_unmap_screen; + } if (fb_alloc_cmap(&info->cmap, 256, 0)) goto out_unmap_screen; |