aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2018-07-27 03:15:15 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-07-28 03:26:31 -0400
commit6d4abf1c0e265d8e99c155b91c1cf44e37793e53 (patch)
tree66f2cc0e5646871b93ec0da0ef9d8220d08b52c9
parent758c579ec631ce5efd8de3d3d35483416ae2cad1 (diff)
staging: axis-fifo: fix return value check in axis_fifo_probe()
In case of error, the function device_create() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: 4a965c5f89de ("staging: add driver for Xilinx AXI-Stream FIFO v4.1 IP core") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/axis-fifo/axis-fifo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/axis-fifo/axis-fifo.c b/drivers/staging/axis-fifo/axis-fifo.c
index 2a73302620ec..51a081df5741 100644
--- a/drivers/staging/axis-fifo/axis-fifo.c
+++ b/drivers/staging/axis-fifo/axis-fifo.c
@@ -1006,10 +1006,10 @@ static int axis_fifo_probe(struct platform_device *pdev)
1006 /* create driver file */ 1006 /* create driver file */
1007 fifo->device = device_create(axis_fifo_driver_class, NULL, fifo->devt, 1007 fifo->device = device_create(axis_fifo_driver_class, NULL, fifo->devt,
1008 NULL, device_name); 1008 NULL, device_name);
1009 if (!fifo->device) { 1009 if (IS_ERR(fifo->device)) {
1010 dev_err(fifo->dt_device, 1010 dev_err(fifo->dt_device,
1011 "couldn't create driver file\n"); 1011 "couldn't create driver file\n");
1012 rc = -ENOMEM; 1012 rc = PTR_ERR(fifo->device);
1013 goto err_chrdev_region; 1013 goto err_chrdev_region;
1014 } 1014 }
1015 dev_set_drvdata(fifo->device, fifo); 1015 dev_set_drvdata(fifo->device, fifo);