diff options
| author | Jamie Iles <jamie@jamieiles.com> | 2011-01-29 00:01:02 -0500 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-01-29 00:01:02 -0500 |
| commit | 36be070ac600d023ada2ec107ee925f5ac5f902b (patch) | |
| tree | 130ba6e6f17286d2698105a3be7fc561f986e4eb /drivers/crypto | |
| parent | 3e50191d981082345572f1e80b463eb9c05989a0 (diff) | |
crypto: omap-sham - don't treat NULL clk as an error
clk_get() returns a struct clk cookie to the driver and some platforms
may return NULL if they only support a single clock. clk_get() has only
failed if it returns a ERR_PTR() encoded pointer.
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Reviewed-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Reviewed-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/omap-sham.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index 2e71123516e0..465cde3e4f60 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c | |||
| @@ -1206,9 +1206,9 @@ static int __devinit omap_sham_probe(struct platform_device *pdev) | |||
| 1206 | 1206 | ||
| 1207 | /* Initializing the clock */ | 1207 | /* Initializing the clock */ |
| 1208 | dd->iclk = clk_get(dev, "ick"); | 1208 | dd->iclk = clk_get(dev, "ick"); |
| 1209 | if (!dd->iclk) { | 1209 | if (IS_ERR(dd->iclk)) { |
| 1210 | dev_err(dev, "clock intialization failed.\n"); | 1210 | dev_err(dev, "clock intialization failed.\n"); |
| 1211 | err = -ENODEV; | 1211 | err = PTR_ERR(dd->iclk); |
| 1212 | goto clk_err; | 1212 | goto clk_err; |
| 1213 | } | 1213 | } |
| 1214 | 1214 | ||
