Re: [PATCH] PS3 ps3av_set_video_mode() make id signed
From: Geert Uytterhoeven <hidden>
Date: 2009-01-20 09:21:17
On Sat, 17 Jan 2009, Roel Kluin wrote:
vi drivers/video/ps3fb.c +618
static int ps3fb_set_par(struct fb_info *info)
{
struct ps3fb_par *par = info->par;
... [ and at line 660 ] ...
if (ps3av_set_video_mode(par->new_mode_id))
now new_mode_id is an int
vi drivers/video/ps3fb.c +132
struct ps3fb_par {
...
int new_mode_id;
...
};
vi drivers/ps3/ps3av.c +844
int ps3av_set_video_mode(u32 id)
-------------------------^^^
{
...
if (... || id < 0) {
--------------------^^^
dev_dbg(&ps3av->dev->core, "%s: error id :%d\n", __func__, id);
return -EINVAL;
}
...
id = ps3av_auto_videomode(&ps3av->av_hw_conf);
if (id < 1) {
---------------------^^^
printk(KERN_ERR "%s: invalid id :%d\n", __func__, id);
return -EINVAL;
}
...
ps3av->ps3av_mode = id;
vi drivers/ps3/ps3av.c +763
static int ps3av_auto_videomode()
-------^^^
+42
static struct ps3av {
...
int ps3av_mode;
...
};
--------------------->8---------------8<-------------------
make id signed so a negative id will get noticedThanks for noticing! It looks OK, except...
quoted hunk ↗ jump to hunk
Signed-off-by: Roel Kluin <redacted> ---diff --git a/drivers/ps3/ps3av.c b/drivers/ps3/ps3av.c index 5324978..7aa6d41 100644 --- a/drivers/ps3/ps3av.c +++ b/drivers/ps3/ps3av.c@@ -838,7 +838,7 @@ static int ps3av_get_hw_conf(struct ps3av *ps3av) } /* set mode using id */ -int ps3av_set_video_mode(u32 id) +int ps3av_set_video_mode(int id) { int size; u32 option;
1. You forgot to update the forward declaration of ps3av_set_video_mode() in arch/powerpc/include/asm/ps3av.h (did you compile this succesfully?) 2. You forgot to change `u32 id' in ps3av_probe(). Can you please make these changes, too? Thx again! With kind regards, Geert Uytterhoeven Software Architect Sony Techsoft Centre Europe The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium Phone: +32 (0)2 700 8453 Fax: +32 (0)2 700 8622 E-mail: Geert.Uytterhoeven@sonycom.com Internet: http://www.sony-europe.com/ A division of Sony Europe (Belgium) N.V. VAT BE 0413.825.160 · RPR Brussels Fortis · BIC GEBABEBB · IBAN BE41293037680010