summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2012-08-25 21:57:08 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-04 14:22:48 -0700
commit45145f9ab143727335477570b436c464880714c8 (patch)
tree5784316ec18eab98d18afb6c59c00bcdcf0c8100
parentdce15efebe76088dc381ab91156842ebf7c79aca (diff)
downloadlinux-3.10-45145f9ab143727335477570b436c464880714c8.tar.gz
linux-3.10-45145f9ab143727335477570b436c464880714c8.tar.bz2
linux-3.10-45145f9ab143727335477570b436c464880714c8.zip
drivers/staging/crystalhd/crystalhd_lnx.c: adjust inconsistent IS_ERR and PTR_ERR
Change the call to PTR_ERR to access the value just tested by IS_ERR. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression e,e1; @@ ( if (IS_ERR(e)) { ... PTR_ERR(e) ... } | if (IS_ERR(e=e1)) { ... PTR_ERR(e) ... } | *if (IS_ERR(e)) { ... * PTR_ERR(e1) ... } ) // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/crystalhd/crystalhd_lnx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
index 5909d8d1b4d..166203aeb7b 100644
--- a/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/drivers/staging/crystalhd/crystalhd_lnx.c
@@ -381,7 +381,7 @@ static int __devinit chd_dec_init_chdev(struct crystalhd_adp *adp)
dev = device_create(crystalhd_class, NULL, MKDEV(adp->chd_dec_major, 0),
NULL, "crystalhd");
if (IS_ERR(dev)) {
- rc = PTR_ERR(crystalhd_class);
+ rc = PTR_ERR(dev);
BCMLOG_ERR("failed to create device\n");
goto device_create_fail;
}