Merge changes Ia318c933,I4bb7316e into msm-3.0
* changes:
msm: audio: qdsp6v2 Fix error handling in memory registration
msm: dsps: Fix include path for timer.h
diff --git a/arch/arm/mach-msm/msm_dsps.c b/arch/arm/mach-msm/msm_dsps.c
index efb2bf6..057665b 100644
--- a/arch/arm/mach-msm/msm_dsps.c
+++ b/arch/arm/mach-msm/msm_dsps.c
@@ -39,7 +39,7 @@
#include <mach/subsystem_restart.h>
#include <mach/subsystem_notif.h>
-#include <timer.h>
+#include "timer.h"
#define DRV_NAME "msm_dsps"
#define DRV_VERSION "3.02"
diff --git a/arch/arm/mach-msm/qdsp6v2/audio_acdb.c b/arch/arm/mach-msm/qdsp6v2/audio_acdb.c
index 9b03985..e7a81d3 100644
--- a/arch/arm/mach-msm/qdsp6v2/audio_acdb.c
+++ b/arch/arm/mach-msm/qdsp6v2/audio_acdb.c
@@ -630,6 +630,7 @@
{
int result;
unsigned long paddr;
+ void *kvptr;
unsigned long kvaddr;
unsigned long mem_len;
@@ -638,6 +639,7 @@
msm_ion_client_create(UINT_MAX, "audio_acdb_client");
if (IS_ERR_OR_NULL(acdb_data.ion_client)) {
pr_err("%s: Could not register ION client!!!\n", __func__);
+ result = PTR_ERR(acdb_data.ion_client);
goto err;
}
@@ -645,6 +647,7 @@
atomic_read(&acdb_data.map_handle));
if (IS_ERR_OR_NULL(acdb_data.ion_handle)) {
pr_err("%s: Could not import map handle!!!\n", __func__);
+ result = PTR_ERR(acdb_data.ion_handle);
goto err_ion_client;
}
@@ -655,12 +658,14 @@
goto err_ion_handle;
}
- kvaddr = (unsigned long)ion_map_kernel(acdb_data.ion_client,
+ kvptr = ion_map_kernel(acdb_data.ion_client,
acdb_data.ion_handle, 0);
- if (IS_ERR_OR_NULL(&kvaddr)) {
+ if (IS_ERR_OR_NULL(kvptr)) {
pr_err("%s: Could not get kernel virt addr!!!\n", __func__);
+ result = PTR_ERR(kvptr);
goto err_ion_handle;
}
+ kvaddr = (unsigned long)kvptr;
mutex_unlock(&acdb_data.acdb_mutex);
atomic64_set(&acdb_data.paddr, paddr);