aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2012-09-18 08:07:59 -0400
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-09-22 17:41:53 -0400
commit8ead8a2e943ac4101f2dc5a806042fe34db976a1 (patch)
tree63092fb3c63f99102613108fd3416db15d177db0
parent7c4c72f4438e3e99ad39b2a86e477fb1c6fd1f3f (diff)
drivers/video/ps3fb.c: fix error return code
Convert a nonnegative error return code to a negative one, as returned elsewhere in the function. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> ( if@p1 (\(ret < 0\|ret != 0\)) { ... return ret; } | ret@p1 = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // </smpl> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
-rw-r--r--drivers/video/ps3fb.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index 213fbbcf613b..26d321dbb5bf 100644
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -1035,6 +1035,7 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev)
1035 if (status) { 1035 if (status) {
1036 dev_err(&dev->core, "%s: lv1_gpu_memory_allocate failed: %d\n", 1036 dev_err(&dev->core, "%s: lv1_gpu_memory_allocate failed: %d\n",
1037 __func__, status); 1037 __func__, status);
1038 retval = -ENOMEM;
1038 goto err_close_device; 1039 goto err_close_device;
1039 } 1040 }
1040 dev_dbg(&dev->core, "ddr:lpar:0x%llx\n", ddr_lpar); 1041 dev_dbg(&dev->core, "ddr:lpar:0x%llx\n", ddr_lpar);
@@ -1047,6 +1048,7 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev)
1047 dev_err(&dev->core, 1048 dev_err(&dev->core,
1048 "%s: lv1_gpu_context_allocate failed: %d\n", __func__, 1049 "%s: lv1_gpu_context_allocate failed: %d\n", __func__,
1049 status); 1050 status);
1051 retval = -ENOMEM;
1050 goto err_gpu_memory_free; 1052 goto err_gpu_memory_free;
1051 } 1053 }
1052 1054
@@ -1054,6 +1056,7 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev)
1054 dinfo = (void __force *)ioremap(lpar_driver_info, 128 * 1024); 1056 dinfo = (void __force *)ioremap(lpar_driver_info, 128 * 1024);
1055 if (!dinfo) { 1057 if (!dinfo) {
1056 dev_err(&dev->core, "%s: ioremap failed\n", __func__); 1058 dev_err(&dev->core, "%s: ioremap failed\n", __func__);
1059 retval = -ENOMEM;
1057 goto err_gpu_context_free; 1060 goto err_gpu_context_free;
1058 } 1061 }
1059 1062
@@ -1122,8 +1125,10 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev)
1122 } 1125 }
1123 1126
1124 info = framebuffer_alloc(sizeof(struct ps3fb_par), &dev->core); 1127 info = framebuffer_alloc(sizeof(struct ps3fb_par), &dev->core);
1125 if (!info) 1128 if (!info) {
1129 retval = -ENOMEM;
1126 goto err_context_fb_close; 1130 goto err_context_fb_close;
1131 }
1127 1132
1128 par = info->par; 1133 par = info->par;
1129 par->mode_id = ~ps3fb_mode; /* != ps3fb_mode, to trigger change */ 1134 par->mode_id = ~ps3fb_mode; /* != ps3fb_mode, to trigger change */