diff options
| author | Greg Kroah-Hartman | 2017-12-18 09:12:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-12-18 09:12:51 +0100 |
| commit | 7f9d04bc568d22e573a10e2a0a316599942786f7 (patch) | |
| tree | 5cd3f32a22ebcc0f0faed657da2fbeb5dd5592c5 /drivers/staging/ccree | |
| parent | staging: pi433: Fix disordered switch case (diff) | |
| parent | Linux 4.15-rc4 (diff) | |
| download | kernel-qcow2-linux-7f9d04bc568d22e573a10e2a0a316599942786f7.tar.gz kernel-qcow2-linux-7f9d04bc568d22e573a10e2a0a316599942786f7.tar.xz kernel-qcow2-linux-7f9d04bc568d22e573a10e2a0a316599942786f7.zip | |
Merge 4.15-rc4 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ccree')
| -rw-r--r-- | drivers/staging/ccree/ssi_hash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/ccree/ssi_hash.c b/drivers/staging/ccree/ssi_hash.c index 5794ab61fdec..e5e71c2cf231 100644 --- a/drivers/staging/ccree/ssi_hash.c +++ b/drivers/staging/ccree/ssi_hash.c @@ -1693,7 +1693,7 @@ static int cc_hash_import(struct ahash_request *req, const void *in) struct device *dev = drvdata_to_dev(ctx->drvdata); struct ahash_req_ctx *state = ahash_request_ctx(req); u32 tmp; - int rc; + int rc = 0; memcpy(&tmp, in, sizeof(u32)); if (tmp != CC_EXPORT_MAGIC) { |