aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorroel kluin <roel.kluin@gmail.com>2009-03-03 03:33:07 -0500
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-03-11 02:10:17 -0400
commite7eec2fc27d7dbefd5852c36b3fe6229e6302c99 (patch)
treeab107ad4b5c3ddf438283567694f2a9089c2b8ef /drivers
parent9146cfc82c082e5c88007e7779b02b7bcade0cf0 (diff)
powerpc/ps3: Make ps3av_set_video_mode mode ID signed
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ps3/ps3av.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/ps3/ps3av.c b/drivers/ps3/ps3av.c
index 5324978b73fb..235e87fcb49f 100644
--- a/drivers/ps3/ps3av.c
+++ b/drivers/ps3/ps3av.c
@@ -838,7 +838,7 @@ static int ps3av_get_hw_conf(struct ps3av *ps3av)
838} 838}
839 839
840/* set mode using id */ 840/* set mode using id */
841int ps3av_set_video_mode(u32 id) 841int ps3av_set_video_mode(int id)
842{ 842{
843 int size; 843 int size;
844 u32 option; 844 u32 option;
@@ -940,7 +940,7 @@ EXPORT_SYMBOL_GPL(ps3av_audio_mute);
940static int ps3av_probe(struct ps3_system_bus_device *dev) 940static int ps3av_probe(struct ps3_system_bus_device *dev)
941{ 941{
942 int res; 942 int res;
943 u32 id; 943 int id;
944 944
945 dev_dbg(&dev->core, " -> %s:%d\n", __func__, __LINE__); 945 dev_dbg(&dev->core, " -> %s:%d\n", __func__, __LINE__);
946 dev_dbg(&dev->core, " timeout=%d\n", timeout); 946 dev_dbg(&dev->core, " timeout=%d\n", timeout);
@@ -962,8 +962,10 @@ static int ps3av_probe(struct ps3_system_bus_device *dev)
962 init_completion(&ps3av->done); 962 init_completion(&ps3av->done);
963 complete(&ps3av->done); 963 complete(&ps3av->done);
964 ps3av->wq = create_singlethread_workqueue("ps3avd"); 964 ps3av->wq = create_singlethread_workqueue("ps3avd");
965 if (!ps3av->wq) 965 if (!ps3av->wq) {
966 res = -ENOMEM;
966 goto fail; 967 goto fail;
968 }
967 969
968 switch (ps3_os_area_get_av_multi_out()) { 970 switch (ps3_os_area_get_av_multi_out()) {
969 case PS3_PARAM_AV_MULTI_OUT_NTSC: 971 case PS3_PARAM_AV_MULTI_OUT_NTSC:
@@ -994,6 +996,12 @@ static int ps3av_probe(struct ps3_system_bus_device *dev)
994 safe_mode = 1; 996 safe_mode = 1;
995#endif /* CONFIG_FB */ 997#endif /* CONFIG_FB */
996 id = ps3av_auto_videomode(&ps3av->av_hw_conf); 998 id = ps3av_auto_videomode(&ps3av->av_hw_conf);
999 if (id < 0) {
1000 printk(KERN_ERR "%s: invalid id :%d\n", __func__, id);
1001 res = -EINVAL;
1002 goto fail;
1003 }
1004
997 safe_mode = 0; 1005 safe_mode = 0;
998 1006
999 mutex_lock(&ps3av->mutex); 1007 mutex_lock(&ps3av->mutex);
@@ -1007,7 +1015,7 @@ static int ps3av_probe(struct ps3_system_bus_device *dev)
1007fail: 1015fail:
1008 kfree(ps3av); 1016 kfree(ps3av);
1009 ps3av = NULL; 1017 ps3av = NULL;
1010 return -ENOMEM; 1018 return res;
1011} 1019}
1012 1020
1013static int ps3av_remove(struct ps3_system_bus_device *dev) 1021static int ps3av_remove(struct ps3_system_bus_device *dev)