diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
| commit | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch) | |
| tree | 6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /drivers/crypto/mv_cesa.c | |
| parent | c506653d35249bb4738bb139c24362e1ae724bc1 (diff) | |
| parent | ec30f343d61391ab23705e50a525da1d55395780 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/crypto/mv_cesa.c')
| -rw-r--r-- | drivers/crypto/mv_cesa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c index 7d279e578df5..c99305afa58a 100644 --- a/drivers/crypto/mv_cesa.c +++ b/drivers/crypto/mv_cesa.c | |||
| @@ -857,7 +857,7 @@ static int mv_cra_hash_init(struct crypto_tfm *tfm, const char *base_hash_name, | |||
| 857 | printk(KERN_WARNING MV_CESA | 857 | printk(KERN_WARNING MV_CESA |
| 858 | "Base driver '%s' could not be loaded!\n", | 858 | "Base driver '%s' could not be loaded!\n", |
| 859 | base_hash_name); | 859 | base_hash_name); |
| 860 | err = PTR_ERR(fallback_tfm); | 860 | err = PTR_ERR(base_hash); |
| 861 | goto err_bad_base; | 861 | goto err_bad_base; |
| 862 | } | 862 | } |
| 863 | } | 863 | } |