aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof HaƂasa <khalasa@piap.pl>2013-09-12 07:25:36 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-10-14 05:32:04 -0400
commit4518274606d1fae701fc20912c0d24361c9e88cb (patch)
tree624ad8c0fc95d23fb494c8095e5647b489ee7e7c
parentb5c2e0abe1d0ffc367d0c1a42e45c91c079838d3 (diff)
[media] SOLO6x10: don't do DMA from stack in solo_dma_vin_region()
[m.chehab@samsung.com: Fix CodingStyle: don't use 2 statements on just one line] Signed-off-by: Krzysztof Ha?asa <khalasa@piap.pl> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/staging/media/solo6x10/solo6x10-disp.c25
1 files changed, 17 insertions, 8 deletions
diff --git a/drivers/staging/media/solo6x10/solo6x10-disp.c b/drivers/staging/media/solo6x10/solo6x10-disp.c
index 32d9953bc36e..145295a5db72 100644
--- a/drivers/staging/media/solo6x10/solo6x10-disp.c
+++ b/drivers/staging/media/solo6x10/solo6x10-disp.c
@@ -176,18 +176,27 @@ static void solo_vout_config(struct solo_dev *solo_dev)
176static int solo_dma_vin_region(struct solo_dev *solo_dev, u32 off, 176static int solo_dma_vin_region(struct solo_dev *solo_dev, u32 off,
177 u16 val, int reg_size) 177 u16 val, int reg_size)
178{ 178{
179 u16 buf[64]; 179 u16 *buf;
180 int i; 180 const int n = 64, size = n * sizeof(*buf);
181 int ret = 0; 181 int i, ret = 0;
182
183 buf = kmalloc(size, GFP_KERNEL);
184 if (!buf)
185 return -ENOMEM;
182 186
183 for (i = 0; i < sizeof(buf) >> 1; i++) 187 for (i = 0; i < n; i++)
184 buf[i] = cpu_to_le16(val); 188 buf[i] = cpu_to_le16(val);
185 189
186 for (i = 0; i < reg_size; i += sizeof(buf)) 190 for (i = 0; i < reg_size; i += size) {
187 ret |= solo_p2m_dma(solo_dev, 1, buf, 191 ret = solo_p2m_dma(solo_dev, 1, buf,
188 SOLO_MOTION_EXT_ADDR(solo_dev) + off + i, 192 SOLO_MOTION_EXT_ADDR(solo_dev) + off + i,
189 sizeof(buf), 0, 0); 193 size, 0, 0);
194
195 if (ret)
196 break;
197 }
190 198
199 kfree(buf);
191 return ret; 200 return ret;
192} 201}
193 202