diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-03-14 09:48:51 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-03-14 10:04:03 +0800 |
| commit | c007aff8141c7af8888dc6c0fd2d6962065a2fa2 (patch) | |
| tree | 428e4dc1583b299618a5df3206b899c1c488cf84 /drivers/crypto | |
| parent | e6176003573fc973c8e296b8d30e810061d50420 (diff) | |
| parent | d0d90af2953bdc7a33b6aa0c90a33a01984a06d2 (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.0.0' into imx_3.0.35_android
Conflicts:
arch/arm/mach-mx6/board-mx6q_sabresd.c
arch/arm/plat-mxc/include/mach/mxc.h
drivers/video/mxc/mxc_ipuv3_fb.c
sound/soc/imx/imx-wm8962.c
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/caam/caamhash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c index 03daad6b4b68..43380476b230 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c @@ -1,7 +1,7 @@ /* * caam - Freescale FSL CAAM support for ahash functions of crypto API * - * Copyright (C) 2011-2012 Freescale Semiconductor, Inc. + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. * * Based on caamalg.c crypto API driver. * @@ -807,7 +807,7 @@ static int ahash_update_ctx(struct ahash_request *req) int *next_buflen = state->current_buf ? &state->buflen_0 : &state->buflen_1, last_buflen; int in_len = *buflen + req->nbytes, to_hash; - u32 *sh_desc = ctx->sh_desc_update, *desc; + u32 *sh_desc = ctx->sh_desc_update, *desc = NULL; dma_addr_t ptr = ctx->sh_desc_update_dma; int src_nents, sec4_sg_bytes, sec4_sg_src_index; struct ahash_edesc *edesc; |