diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-08-04 20:44:35 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-08-04 20:44:35 +0800 |
| commit | 1d6669fa83bc31b94f71ff12bbbed3516eefc705 (patch) | |
| tree | 72aceaf13b935638995c337d9e61204453967fbc /drivers/char/hw_random/core.c | |
| parent | 76bea64c4c8d7fa911eb485c4c2b8583e813331e (diff) | |
| parent | 17fb874dee093139923af8ed36061faa92cc8e79 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pull in the qat registration bug fix.
Diffstat (limited to 'drivers/char/hw_random/core.c')
| -rw-r--r-- | drivers/char/hw_random/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c index da8faf78536a..5643b65cee20 100644 --- a/drivers/char/hw_random/core.c +++ b/drivers/char/hw_random/core.c @@ -429,7 +429,7 @@ static int hwrng_fillfn(void *unused) static void start_khwrngd(void) { hwrng_fill = kthread_run(hwrng_fillfn, NULL, "hwrng"); - if (hwrng_fill == ERR_PTR(-ENOMEM)) { + if (IS_ERR(hwrng_fill)) { pr_err("hwrng_fill thread creation failed"); hwrng_fill = NULL; } |