aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-11-13 05:06:38 -0500
committerPaul Mundt <lethal@linux-sh.org>2010-11-17 00:55:43 -0500
commitc353103de8795358af1584088aa471571decb307 (patch)
tree5f83429d2d42d173d46ec7a8cef09f820b58790e
parentb22fe37b9907bf9cd61665ed4b865bc1d5cf71e8 (diff)
fbcmap: cleanup white space in fb_alloc_cmap()
checkpatch.pl and Andrew Morton both complained about the indenting in fb_alloc_cmap() Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--drivers/video/fbcmap.c54
1 files changed, 30 insertions, 24 deletions
diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
index f53b9f1d6ab..a79b9762901 100644
--- a/drivers/video/fbcmap.c
+++ b/drivers/video/fbcmap.c
@@ -90,32 +90,38 @@ static const struct fb_cmap default_16_colors = {
90 90
91int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp) 91int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp)
92{ 92{
93 int size = len*sizeof(u16); 93 int size = len * sizeof(u16);
94 94
95 if (cmap->len != len) { 95 if (cmap->len != len) {
96 fb_dealloc_cmap(cmap); 96 fb_dealloc_cmap(cmap);
97 if (!len) 97 if (!len)
98 return 0; 98 return 0;
99 if (!(cmap->red = kmalloc(size, GFP_ATOMIC))) 99
100 goto fail; 100 cmap->red = kmalloc(size, GFP_ATOMIC);
101 if (!(cmap->green = kmalloc(size, GFP_ATOMIC))) 101 if (!cmap->red)
102 goto fail; 102 goto fail;
103 if (!(cmap->blue = kmalloc(size, GFP_ATOMIC))) 103 cmap->green = kmalloc(size, GFP_ATOMIC);
104 goto fail; 104 if (!cmap->green)
105 if (transp) { 105 goto fail;
106 if (!(cmap->transp = kmalloc(size, GFP_ATOMIC))) 106 cmap->blue = kmalloc(size, GFP_ATOMIC);
107 goto fail; 107 if (!cmap->blue)
108 } else 108 goto fail;
109 cmap->transp = NULL; 109 if (transp) {
110 } 110 cmap->transp = kmalloc(size, GFP_ATOMIC);
111 cmap->start = 0; 111 if (!cmap->transp)
112 cmap->len = len; 112 goto fail;
113 fb_copy_cmap(fb_default_cmap(len), cmap); 113 } else {
114 return 0; 114 cmap->transp = NULL;
115 }
116 }
117 cmap->start = 0;
118 cmap->len = len;
119 fb_copy_cmap(fb_default_cmap(len), cmap);
120 return 0;
115 121
116fail: 122fail:
117 fb_dealloc_cmap(cmap); 123 fb_dealloc_cmap(cmap);
118 return -ENOMEM; 124 return -ENOMEM;
119} 125}
120 126
121/** 127/**