aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-06-15 02:22:42 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-09 17:19:34 -0400
commitfc2f677465861b3ab0331d172859dbd668eed9f2 (patch)
tree370d756603ef03126a8c2c4a9a4e0a2f1cd8d554 /drivers/misc
parentd238a0ec8b850e81185f1b176c1f436684ce476b (diff)
drivers/misc/carma/carma-fpga.c: use PTR_ERR_OR_ZERO
replace IS_ERR/PTR_ERR Cc: Grant Likely <grant.likely@linaro.org> Cc: Rob Herring <robh+dt@kernel.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/carma/carma-fpga.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-fpga.c
index 14d90eae605b..55e913b7eb11 100644
--- a/drivers/misc/carma/carma-fpga.c
+++ b/drivers/misc/carma/carma-fpga.c
@@ -954,10 +954,7 @@ static int data_debugfs_init(struct fpga_device *priv)
954{ 954{
955 priv->dbg_entry = debugfs_create_file(drv_name, S_IRUGO, NULL, priv, 955 priv->dbg_entry = debugfs_create_file(drv_name, S_IRUGO, NULL, priv,
956 &data_debug_fops); 956 &data_debug_fops);
957 if (IS_ERR(priv->dbg_entry)) 957 return PTR_ERR_OR_ZERO(priv->dbg_entry);
958 return PTR_ERR(priv->dbg_entry);
959
960 return 0;
961} 958}
962 959
963static void data_debugfs_exit(struct fpga_device *priv) 960static void data_debugfs_exit(struct fpga_device *priv)