diff options
| author | Bryan Buckley <bryan.buckley@ti.com> | 2011-10-12 11:52:13 -0500 |
|---|---|---|
| committer | Dan Murphy <dmurphy@ti.com> | 2011-11-01 08:30:34 -0500 |
| commit | 6409c63e20b51b47d2e210fc64c524c2fc231c0e (patch) | |
| tree | 739df8f64192a581997a6e44f54c998c4c1ac726 /security/smc | |
| parent | e879d0e0d42b7f57cc1ed850ca55acf20e4a2cfc (diff) | |
| download | kernel_samsung_espresso10-6409c63e20b51b47d2e210fc64c524c2fc231c0e.zip kernel_samsung_espresso10-6409c63e20b51b47d2e210fc64c524c2fc231c0e.tar.gz kernel_samsung_espresso10-6409c63e20b51b47d2e210fc64c524c2fc231c0e.tar.bz2 | |
OMAP4: SMC: Fix two compiler warnings in security/smc/tf_comm.c
security/smc/tf_comm.c: In function 'tf_fill_descriptor_table':
security/smc/tf_comm.c:835: warning: ISO C90 forbids mixed
declarations and code
security/smc/tf_comm.c:918: warning: 'error' may be used uninitialized
in this function
security/smc/tf_comm.c:645: note: 'error' was declared here
Moved declaration of "struct page *page" to beginning of functional block.
Ensure 'error' gets set correctly and never reports a false negative.
Change-Id: Icbb10298eb5da9b455ede587195a0a7a16feef13
Signed-off-by: Bryan Buckley <bryan.buckley@ti.com>
Diffstat (limited to 'security/smc')
| -rw-r--r-- | security/smc/tf_comm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/security/smc/tf_comm.c b/security/smc/tf_comm.c index 79b4034..451e63e 100644 --- a/security/smc/tf_comm.c +++ b/security/smc/tf_comm.c @@ -822,6 +822,7 @@ int tf_fill_descriptor_table( for (j = page_shift; j < pages_to_get; j++) { + struct page *page; void *addr = (void *)(buffer_offset_vaddr + (j - page_shift) * PAGE_SIZE); @@ -830,14 +831,16 @@ int tf_fill_descriptor_table( "tf_fill_descriptor_table: " "cannot handle address %p\n", addr); + error = -EFAULT; goto error; } - struct page *page = vmalloc_to_page(addr); + page = vmalloc_to_page(addr); if (page == NULL) { dprintk(KERN_ERR "tf_fill_descriptor_table: " "cannot map %p to page\n", addr); + error = -ENOMEM; goto error; } coarse_pg_table->descriptors[j] = (u32)page; |