Merge tag 'ti-teslabridgedev-omap4-24.0.9' of git://dev.omapzoom.org/pub/scm/tisyslink/kernel-syslink into temp

Conflicts:

	TI_OMAP4_Syslink_Release_Notes_L24.x.txt
	arch/arm/mach-omap2/io.c
Resolved

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/dsp/syslink/multicore_ipc/nameserver.c b/drivers/dsp/syslink/multicore_ipc/nameserver.c
index c543fcba713d..2be633adab58 100644
--- a/drivers/dsp/syslink/multicore_ipc/nameserver.c
+++ b/drivers/dsp/syslink/multicore_ipc/nameserver.c
@@ -767,13 +767,16 @@ int nameserver_get_local(void *handle, const char *name,
 		goto error;
 	}
 
-	if (entry->len >= length)
+	if (entry->len >= length) {
 		memcpy(buffer, entry->buf, length);
-	else
+		retval = length;
+	} else {
 		memcpy(buffer, entry->buf, entry->len);
+		retval = entry->len;
+	}
 
 	mutex_unlock(temp_obj->gate_handle);
-	return 0;
+	return retval;
 
 error:
 	mutex_unlock(temp_obj->gate_handle);
@@ -814,7 +817,7 @@ int nameserver_get(void *handle, const char *name,
 	if (proc_id == NULL) {
 		retval = nameserver_get_local(temp_obj, name,
 						buffer, length);
-		if (retval == 0) /* Got the value */
+		if (retval > 0) /* Got the value */
 			goto exit;
 
 		for (i = 0; i < max_proc_id; i++) {
@@ -838,7 +841,7 @@ int nameserver_get(void *handle, const char *name,
 		if (i == local_proc_id) {
 			retval = nameserver_get_local(temp_obj,
 							name, buffer, length);
-			if (retval == 0)
+			if (retval > 0)
 				break;
 
 		} else {
@@ -851,7 +854,7 @@ int nameserver_get(void *handle, const char *name,
 	}
 
 exit:
-	printk(KERN_ERR "nameserver_get_local failed status:%x \n", retval);
+	printk(KERN_ERR "nameserver_get status:%x \n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(nameserver_get);