summaryrefslogtreecommitdiffstats
path: root/drivers/crypto/nx
diff options
context:
space:
mode:
authorDan Streetman <ddstreet@ieee.org>2015-07-22 14:26:34 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2015-07-23 18:14:30 +0800
commitee781b7ff3d8ab93bf99b1c3e1f0a29dda2a63e5 (patch)
treeabfda8330f09bed621d251c77319b50c85595ec1 /drivers/crypto/nx
parent7f6e3aad5ab31c310b36bf0edcd305305b20e2a8 (diff)
downloadlinux-ee781b7ff3d8ab93bf99b1c3e1f0a29dda2a63e5.tar.bz2
crypto: nx - don't register pSeries driver if ENODEV
Don't register the pSeries driver when parsing the device tree returns ENODEV. The nx842_probe() function in the pSeries driver returns error instead of registering as a crypto compression driver, when it receives an error return value from the nx842_OF_upd() function that probes the device tree nodes, except when ENODEV is returned. However ENODEV should not be a special case and the driver should not register when there is no hw device, or the hw device is disabled. Signed-off-by: Dan Streetman <ddstreet@ieee.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/nx')
-rw-r--r--drivers/crypto/nx/nx-842-pseries.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/crypto/nx/nx-842-pseries.c b/drivers/crypto/nx/nx-842-pseries.c
index 74c53a119b0b..4b7bd8fb6a6b 100644
--- a/drivers/crypto/nx/nx-842-pseries.c
+++ b/drivers/crypto/nx/nx-842-pseries.c
@@ -999,11 +999,8 @@ static int nx842_probe(struct vio_dev *viodev,
of_reconfig_notifier_register(&nx842_of_nb);
ret = nx842_OF_upd(NULL);
- if (ret && ret != -ENODEV) {
- dev_err(&viodev->dev, "could not parse device tree. %d\n", ret);
- ret = -1;
+ if (ret)
goto error;
- }
rcu_read_lock();
dev_set_drvdata(&viodev->dev, rcu_dereference(devdata));