summaryrefslogtreecommitdiff
path: root/drivers/w1
diff options
context:
space:
mode:
authorAnton Vorontsov <cbouatmailru@gmail.com>2008-03-04 14:28:43 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-04 16:35:12 -0800
commitfbc357df2e7728feb010148bed4eccb03a181610 (patch)
tree4be747467720b697118ffeb3b65f8a6d363f264b /drivers/w1
parent4874cc1b5142397d585c63d84b3d6d3afff60354 (diff)
downloadlinux-3.10-fbc357df2e7728feb010148bed4eccb03a181610.tar.gz
linux-3.10-fbc357df2e7728feb010148bed4eccb03a181610.tar.bz2
linux-3.10-fbc357df2e7728feb010148bed4eccb03a181610.zip
ds1wm: should check for IS_ERR(clk) instead of NULL
On the error condition clk_get() returns ERR_PTR(..), so checking for NULL doesn't work. ds1wm module causes a kernel oops when ds1wm clock isn't registered. This patch converts NULL check to IS_ERR(), plus uses PTR_ERR() for the return code. Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com> Acked-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/w1')
-rw-r--r--drivers/w1/masters/ds1wm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index 688e435b4d9..78a14dacb8e 100644
--- a/drivers/w1/masters/ds1wm.c
+++ b/drivers/w1/masters/ds1wm.c
@@ -17,6 +17,7 @@
#include <linux/pm.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
+#include <linux/err.h>
#include <linux/delay.h>
#include <linux/ds1wm.h>
@@ -374,8 +375,8 @@ static int ds1wm_probe(struct platform_device *pdev)
goto err1;
ds1wm_data->clk = clk_get(&pdev->dev, "ds1wm");
- if (!ds1wm_data->clk) {
- ret = -ENOENT;
+ if (IS_ERR(ds1wm_data->clk)) {
+ ret = PTR_ERR(ds1wm_data->clk);
goto err2;
}