diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/crypto/ixp4xx_crypto.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/crypto/ixp4xx_crypto.c')
| -rw-r--r-- | drivers/crypto/ixp4xx_crypto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c index 0d662213c066..4c20c5bf6058 100644 --- a/drivers/crypto/ixp4xx_crypto.c +++ b/drivers/crypto/ixp4xx_crypto.c | |||
| @@ -1044,7 +1044,7 @@ static int aead_perform(struct aead_request *req, int encrypt, | |||
| 1044 | memcpy(crypt->iv, req->iv, ivsize); | 1044 | memcpy(crypt->iv, req->iv, ivsize); |
| 1045 | 1045 | ||
| 1046 | if (req->src != req->dst) { | 1046 | if (req->src != req->dst) { |
| 1047 | BUG(); /* -ENOTSUP because of my lazyness */ | 1047 | BUG(); /* -ENOTSUP because of my laziness */ |
| 1048 | } | 1048 | } |
| 1049 | 1049 | ||
| 1050 | /* ASSOC data */ | 1050 | /* ASSOC data */ |