From: Hans Verkuil <hans.verkuil@xxxxxxxxx>
Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
---
drivers/staging/media/solo6x10/enc.c | 4 ++--
drivers/staging/media/solo6x10/p2m.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/media/solo6x10/enc.c b/drivers/staging/media/solo6x10/enc.c
index de50259..667c20a6 100644
--- a/drivers/staging/media/solo6x10/enc.c
+++ b/drivers/staging/media/solo6x10/enc.c
@@ -99,7 +99,7 @@ static void solo_capture_config(struct solo_dev *solo_dev)
solo_reg_write(solo_dev, SOLO_VE_OSD_OPT, 0);
/* Clear OSG buffer */
- buf = kzalloc(OSG_BUFFER_SIZE, GFP_KERNEL);
+ buf = kzalloc(OSG_BUFFER_SIZE, GFP_KERNEL | __GFP_DMA32);
if (!buf)
return;
@@ -130,7 +130,7 @@ int solo_osd_print(struct solo_enc_dev *solo_enc)
return 0;
}
- buf = kzalloc(SOLO_EOSD_EXT_SIZE, GFP_KERNEL);
+ buf = kzalloc(SOLO_EOSD_EXT_SIZE, GFP_KERNEL | __GFP_DMA32);
if (!buf)
return -ENOMEM;
diff --git a/drivers/staging/media/solo6x10/p2m.c b/drivers/staging/media/solo6x10/p2m.c
index 58ab61b..65911fa 100644
--- a/drivers/staging/media/solo6x10/p2m.c
+++ b/drivers/staging/media/solo6x10/p2m.c
@@ -50,7 +50,7 @@ int solo_p2m_dma(struct solo_dev *solo_dev, u8 id, int wr,
int solo_p2m_dma_t(struct solo_dev *solo_dev, u8 id, int wr,
dma_addr_t dma_addr, u32 ext_addr, u32 size)
{
- struct p2m_desc *desc = kzalloc(sizeof(*desc) * 2, GFP_DMA);
+ struct p2m_desc *desc = kzalloc(sizeof(*desc) * 2, GFP_KERNEL | __GFP_DMA32);
int ret;
if (desc == NULL)
@@ -194,13 +194,13 @@ static unsigned long long p2m_test(struct solo_dev *solo_dev, u8 id,
int i;
unsigned long long err_cnt = 0;
- wr_buf = kmalloc(size, GFP_KERNEL);
+ wr_buf = kmalloc(size, GFP_KERNEL | __GFP_DMA32);
if (!wr_buf) {
printk(SOLO6X10_NAME ": Failed to malloc for p2m_test\n");
return size;
}
- rd_buf = kmalloc(size, GFP_KERNEL);
+ rd_buf = kmalloc(size, GFP_KERNEL | __GFP_DMA32);
if (!rd_buf) {
printk(SOLO6X10_NAME ": Failed to malloc for p2m_test\n");
kfree(wr_buf);
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
