Revert "staging: comedi: drivers: Remove unneeded NULL check before kfree()"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 11 Mar 2016 03:35:54 +0000 (19:35 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 11 Mar 2016 03:35:54 +0000 (19:35 -0800)
This reverts commit 3545bee9b8ec00ba733e17363f494c8761fb5e49.

It's not correct.

Reported-by: Hartley Sweeten <HartleyS@visionengravers.com>
Cc: Janani Ravichandran <janani.rvchndrn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/amplc_pci224.c

index 656df1abce8904c104f6370ebff1d306bdb85a1f..cac011fdd375d6e93033577738dfafa30c8f179a 100644 (file)
@@ -1096,8 +1096,10 @@ static void pci224_detach(struct comedi_device *dev)
        struct pci224_private *devpriv = dev->private;
 
        comedi_pci_detach(dev);
-       kfree(devpriv->ao_scan_vals);
-       kfree(devpriv->ao_scan_order);
+       if (devpriv) {
+               kfree(devpriv->ao_scan_vals);
+               kfree(devpriv->ao_scan_order);
+       }
 }
 
 static struct comedi_driver amplc_pci224_driver = {
This page took 0.026391 seconds and 5 git commands to generate.