aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <[email protected]>2016-03-22 11:10:41 -0700
committerGreg Kroah-Hartman <[email protected]>2016-03-28 07:30:36 -0700
commit26a0fe3ffa24c63a99b1fb314e03723c1e470ba0 (patch)
tree818b117454dcfc7ee07ae40dda62d97e37a982fc
parent32f89d8e70106f2b636c716a7cfb7fe53cfc5ebf (diff)
staging: comedi: ni_660x: ni_gpct_device_destroy() can handle a NULL pointer
Remove the unnecessary NULL pointer check. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/staging/comedi/drivers/ni_660x.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index 35602cc7af61..2440cb6a72c7 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -1067,8 +1067,7 @@ static void ni_660x_detach(struct comedi_device *dev)
if (dev->irq)
free_irq(dev->irq, dev);
if (devpriv) {
- if (devpriv->counter_dev)
- ni_gpct_device_destroy(devpriv->counter_dev);
+ ni_gpct_device_destroy(devpriv->counter_dev);
ni_660x_free_mite_rings(dev);
mite_detach(devpriv->mite);
}