summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-08-08 14:22:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-08 15:57:25 -0700
commit340f365dd9d74d0ca55089481b9c665955db0aaa (patch)
treeacf3d79e0c3e571fffcea26a0656743cf66fb3b1
parent69361eef9056b0babb507798c2135ad1572f0ef7 (diff)
downloadlinux-340f365dd9d74d0ca55089481b9c665955db0aaa.tar.bz2
drivers/parport/parport_ip32.c: use PTR_ERR_OR_ZERO
replace IS_ERR/PTR_ERR Signed-off-by: Fabian Frederick <fabf@skynet.be> Cc: Wolfram Sang <wsa@the-dreams.de> Cc: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/parport/parport_ip32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/parport_ip32.c b/drivers/parport/parport_ip32.c
index c864f82bd37d..30e981be14c2 100644
--- a/drivers/parport/parport_ip32.c
+++ b/drivers/parport/parport_ip32.c
@@ -2204,7 +2204,7 @@ static int __init parport_ip32_init(void)
{
pr_info(PPIP32 "SGI IP32 built-in parallel port driver v0.6\n");
this_port = parport_ip32_probe_port();
- return IS_ERR(this_port) ? PTR_ERR(this_port) : 0;
+ return PTR_ERR_OR_ZERO(this_port);
}
/**