[PATCH 30/42] staging: comedi: ni_660x: ni_gpct_device_destroy() can handle a NULL pointer

[Ian Abbott]

On 18/03/16 19:39, H Hartley Sweeten wrote:
> Remove the unnecessary NULL pointer check.
>
> Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
> Cc: Ian Abbott <abbotti at mev.co.uk>
> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> ---
>   drivers/staging/comedi/drivers/ni_660x.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
> index 35602cc..2440cb6 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);
>   	}
>

ni_gpct_device_destroy() doesn't currently check that it's parameter is 
non-NULL before dereferencing it, so this will break.

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti at mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-