projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull platform-drivers into test branch
[powerpc.git]
/
drivers
/
video
/
aty
/
aty128fb.c
diff --git
a/drivers/video/aty/aty128fb.c
b/drivers/video/aty/aty128fb.c
index
276a215
..
2e976ff
100644
(file)
--- a/
drivers/video/aty/aty128fb.c
+++ b/
drivers/video/aty/aty128fb.c
@@
-1333,6
+1333,8
@@
static int aty128_var_to_pll(u32 period_in_ps, struct aty128_pll *pll,
if (vclk * 12 < c.ppll_min)
vclk = c.ppll_min/12;
if (vclk * 12 < c.ppll_min)
vclk = c.ppll_min/12;
+ pll->post_divider = -1;
+
/* now, find an acceptable divider */
for (i = 0; i < sizeof(post_dividers); i++) {
output_freq = post_dividers[i] * vclk;
/* now, find an acceptable divider */
for (i = 0; i < sizeof(post_dividers); i++) {
output_freq = post_dividers[i] * vclk;
@@
-1342,6
+1344,9
@@
static int aty128_var_to_pll(u32 period_in_ps, struct aty128_pll *pll,
}
}
}
}
+ if (pll->post_divider < 0)
+ return -EINVAL;
+
/* calculate feedback divider */
n = c.ref_divider * output_freq;
d = c.ref_clk;
/* calculate feedback divider */
n = c.ref_divider * output_freq;
d = c.ref_clk;
@@
-1829,7
+1834,7
@@
static void aty128_bl_init(struct aty128fb_par *par)
snprintf(name, sizeof(name), "aty128bl%d", info->node);
snprintf(name, sizeof(name), "aty128bl%d", info->node);
- bd = backlight_device_register(name, par, &aty128_bl_data);
+ bd = backlight_device_register(name,
info->dev,
par, &aty128_bl_data);
if (IS_ERR(bd)) {
info->bl_dev = NULL;
printk(KERN_WARNING "aty128: Backlight registration failed\n");
if (IS_ERR(bd)) {
info->bl_dev = NULL;
printk(KERN_WARNING "aty128: Backlight registration failed\n");