diff options
| author | Shujuan Chen <shujuan.chen@stericsson.com> | 2010-06-21 15:32:59 +0200 |
|---|---|---|
| committer | Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> | 2010-10-23 13:29:45 +0200 |
| commit | bb33b0682004eb19ba6f16fb8c21253a0886c598 (patch) | |
| tree | f023d4adfcde244f7cde9f286a0c485c4dbfc7ee /drivers/tee | |
| parent | ad83d2addfa2686c67dcce030d76d939082b9a3b (diff) | |
fixing u5500_svp build error due to tee kernel patch
Updated with review comments!
ST-Ericsson Change ID: ER264554
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Change-Id: I729890273126a22800c521607c74a98ece39eb2d
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2574
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'drivers/tee')
| -rw-r--r-- | drivers/tee/Makefile | 3 | ||||
| -rw-r--r-- | drivers/tee/tee_service_svp.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/tee/Makefile b/drivers/tee/Makefile index 8203426fd79..7fac2911a8a 100644 --- a/drivers/tee/Makefile +++ b/drivers/tee/Makefile @@ -8,9 +8,8 @@ EXTRA_CFLAGS = -O0 ifdef CONFIG_MACH_U5500_SIMULATOR obj-$(CONFIG_TEE_SUPPORT) += tee_service_svp.o -else - obj-$(CONFIG_TEE_SUPPORT) += tee_service.o endif +obj-$(CONFIG_TEE_SUPPORT) += tee_service.o obj-$(CONFIG_TEE_SUPPORT) += tee_driver.o obj-$(CONFIG_TEE_SUPPORT) += ta/ diff --git a/drivers/tee/tee_service_svp.c b/drivers/tee/tee_service_svp.c index a5bd3254f30..2f3caa80732 100644 --- a/drivers/tee/tee_service_svp.c +++ b/drivers/tee/tee_service_svp.c @@ -9,7 +9,7 @@ #include <linux/kernel.h> #include <linux/string.h> #include <linux/tee.h> - +#include <linux/err.h> #include "ta/tee_ta_start_modem.h" static int cmp_uuid_start_modem(struct tee_uuid *uuid) @@ -47,7 +47,7 @@ int call_sec_world(struct tee_session *ts) switch (ts->cmd) { case COMMAND_ID_START_MODEM: ret = tee_ta_start_modem((struct tee_ta_start_modem *) - ts->its); + ts->idata); if (ret) { ts->err = TEED_ERROR_GENERIC; ts->origin = TEED_ORIGIN_TEE_APPLICATION; |