iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/ps3: Make ps3av_set_video_mode mode ID signed

Browse Source 
Change the ps3av_auto_videomode() mode id argument type from unsigned to
signed so a negative id can be detected and reported as an -EINVAL failure.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
roel kluin 2009-03-03 08:33:07 +00:00 committed by Benjamin Herrenschmidt
parent 9146cfc82c
commit e7eec2fc27
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/include/asm/ps3av.h
View File

@ -730,7 +730,7 @@ extern int ps3av_cmd_av_get_hw_conf(struct ps3av_pkt_av_get_hw_conf *);
extern int ps3av_cmd_video_get_monitor_info(struct ps3av_pkt_av_get_monitor_info *, extern int ps3av_cmd_video_get_monitor_info(struct ps3av_pkt_av_get_monitor_info *,
u32); u32);
extern int ps3av_set_video_mode(u32); extern int ps3av_set_video_mode(int);
extern int ps3av_set_audio_mode(u32, u32, u32, u32, u32); extern int ps3av_set_audio_mode(u32, u32, u32, u32, u32);
extern int ps3av_get_auto_mode(void); extern int ps3av_get_auto_mode(void);
extern int ps3av_get_mode(void); extern int ps3av_get_mode(void);

16
drivers/ps3/ps3av.c
View File

@ -838,7 +838,7 @@ static int ps3av_get_hw_conf(struct ps3av *ps3av)
} }
/* set mode using id */ /* set mode using id */
int ps3av_set_video_mode(u32 id) int ps3av_set_video_mode(int id)
{ {
int size; int size;
u32 option; u32 option;
@ -940,7 +940,7 @@ EXPORT_SYMBOL_GPL(ps3av_audio_mute);
static int ps3av_probe(struct ps3_system_bus_device *dev) static int ps3av_probe(struct ps3_system_bus_device *dev)
{ {
int res; int res;
u32 id; int id;
dev_dbg(&dev->core, " -> %s:%d\n", __func__, __LINE__); dev_dbg(&dev->core, " -> %s:%d\n", __func__, __LINE__);
dev_dbg(&dev->core, " timeout=%d\n", timeout); dev_dbg(&dev->core, " timeout=%d\n", timeout);
@ -962,8 +962,10 @@ static int ps3av_probe(struct ps3_system_bus_device *dev)
init_completion(&ps3av->done); init_completion(&ps3av->done);
complete(&ps3av->done); complete(&ps3av->done);
ps3av->wq = create_singlethread_workqueue("ps3avd"); ps3av->wq = create_singlethread_workqueue("ps3avd");
if (!ps3av->wq) if (!ps3av->wq) {
res = -ENOMEM;
goto fail; goto fail;
}
switch (ps3_os_area_get_av_multi_out()) { switch (ps3_os_area_get_av_multi_out()) {
case PS3_PARAM_AV_MULTI_OUT_NTSC: case PS3_PARAM_AV_MULTI_OUT_NTSC:
@ -994,6 +996,12 @@ static int ps3av_probe(struct ps3_system_bus_device *dev)
safe_mode = 1; safe_mode = 1;
#endif /* CONFIG_FB */ #endif /* CONFIG_FB */
id = ps3av_auto_videomode(&ps3av->av_hw_conf); id = ps3av_auto_videomode(&ps3av->av_hw_conf);
if (id < 0) {
printk(KERN_ERR "%s: invalid id :%d\n", __func__, id);
res = -EINVAL;
goto fail;
}
safe_mode = 0; safe_mode = 0;
mutex_lock(&ps3av->mutex); mutex_lock(&ps3av->mutex);
@ -1007,7 +1015,7 @@ static int ps3av_probe(struct ps3_system_bus_device *dev)
fail: fail:
kfree(ps3av); kfree(ps3av);
ps3av = NULL; ps3av = NULL;
return -ENOMEM; return res;
} }
static int ps3av_remove(struct ps3_system_bus_device *dev) static int ps3av_remove(struct ps3_system_bus_device *dev)