diff options
| author | Puja Gupta <pujag@codeaurora.org> | 2016-05-18 12:19:10 -0700 |
|---|---|---|
| committer | Jeevan Shriram <jshriram@codeaurora.org> | 2016-05-19 16:06:57 -0700 |
| commit | 7aa48fb55bb3cecb4b0523fd5a1ba19ca3f506ec (patch) | |
| tree | c1b0bd7e3285d541f7401306f37de71f895e71d1 | |
| parent | db397c99cd29d90b397d72934925bc86b1c647a6 (diff) | |
soc: qcom: ramdump: Fix bug introduced in kernel upgrade
Uncomment some code which got commented during kernel upgrade by mistake
CRs-Fixed: 1015492
Change-Id: Id46bff3b3803d1316ea769581c0f1b0e7fa41498
Signed-off-by: Puja Gupta <pujag@codeaurora.org>
| -rw-r--r-- | drivers/soc/qcom/ramdump.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/soc/qcom/ramdump.c b/drivers/soc/qcom/ramdump.c index 8792ac046986..08499c549b47 100644 --- a/drivers/soc/qcom/ramdump.c +++ b/drivers/soc/qcom/ramdump.c @@ -154,9 +154,8 @@ static ssize_t ramdump_read(struct file *filep, char __user *buf, size_t count, init_dma_attrs(&rd_dev->attrs); dma_set_attr(DMA_ATTR_SKIP_ZEROING, &rd_dev->attrs); - device_mem = vaddr; - //device_mem = vaddr ?: dma_remap(rd_dev->device.parent, NULL, addr, - // copy_size, &rd_dev->attrs); + device_mem = vaddr ?: dma_remap(rd_dev->device.parent, NULL, addr, + copy_size, &rd_dev->attrs); origdevice_mem = device_mem; if (device_mem == NULL) { @@ -206,8 +205,8 @@ static ssize_t ramdump_read(struct file *filep, char __user *buf, size_t count, } kfree(finalbuf); - //if (!vaddr && origdevice_mem) - //dma_unremap(rd_dev->device.parent, origdevice_mem, copy_size); + if (!vaddr && origdevice_mem) + dma_unremap(rd_dev->device.parent, origdevice_mem, copy_size); *pos += copy_size; @@ -217,8 +216,8 @@ static ssize_t ramdump_read(struct file *filep, char __user *buf, size_t count, return *pos - orig_pos; ramdump_done: - //if (!vaddr && origdevice_mem) - //dma_unremap(rd_dev->device.parent, origdevice_mem, copy_size); + if (!vaddr && origdevice_mem) + dma_unremap(rd_dev->device.parent, origdevice_mem, copy_size); kfree(finalbuf); rd_dev->data_ready = 0; |