staging: comedi: Remove NULL check before kfree
This patch was generated by the following semantic patch: // <smpl> @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // </smpl> Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
46d994b1f5
commit
e4e1f289be
|
@ -383,14 +383,7 @@ EXPORT_SYMBOL(subdev_8255_init_irq);
|
|||
|
||||
void subdev_8255_cleanup(struct comedi_device *dev, struct comedi_subdevice *s)
|
||||
{
|
||||
if (s->private) {
|
||||
/* this test does nothing, so comment it out
|
||||
* if (subdevpriv->have_irq) {
|
||||
* }
|
||||
*/
|
||||
|
||||
kfree(s->private);
|
||||
}
|
||||
kfree(s->private);
|
||||
}
|
||||
EXPORT_SYMBOL(subdev_8255_cleanup);
|
||||
|
||||
|
|
|
@ -1695,10 +1695,8 @@ static int das16_detach(struct comedi_device *dev)
|
|||
}
|
||||
if (devpriv->dma_chan)
|
||||
free_dma(devpriv->dma_chan);
|
||||
if (devpriv->user_ai_range_table)
|
||||
kfree(devpriv->user_ai_range_table);
|
||||
if (devpriv->user_ao_range_table)
|
||||
kfree(devpriv->user_ao_range_table);
|
||||
kfree(devpriv->user_ai_range_table);
|
||||
kfree(devpriv->user_ao_range_table);
|
||||
}
|
||||
|
||||
if (dev->irq)
|
||||
|
|
|
@ -479,8 +479,7 @@ static int a2150_detach(struct comedi_device *dev)
|
|||
if (devpriv) {
|
||||
if (devpriv->dma)
|
||||
free_dma(devpriv->dma);
|
||||
if (devpriv->dma_buffer)
|
||||
kfree(devpriv->dma_buffer);
|
||||
kfree(devpriv->dma_buffer);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -797,8 +797,7 @@ int labpc_common_detach(struct comedi_device *dev)
|
|||
subdev_8255_cleanup(dev, dev->subdevices + 2);
|
||||
|
||||
/* only free stuff if it has been allocated by _attach */
|
||||
if (devpriv->dma_buffer)
|
||||
kfree(devpriv->dma_buffer);
|
||||
kfree(devpriv->dma_buffer);
|
||||
if (devpriv->dma_chan)
|
||||
free_dma(devpriv->dma_chan);
|
||||
if (dev->irq)
|
||||
|
|
|
@ -907,12 +907,8 @@ static int serial2002_detach(struct comedi_device *dev)
|
|||
printk("comedi%d: serial2002: remove\n", dev->minor);
|
||||
for (i = 0; i < 5; i++) {
|
||||
s = &dev->subdevices[i];
|
||||
if (s->maxdata_list) {
|
||||
kfree(s->maxdata_list);
|
||||
}
|
||||
if (s->range_table_list) {
|
||||
kfree(s->range_table_list);
|
||||
}
|
||||
kfree(s->maxdata_list);
|
||||
kfree(s->range_table_list);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -2265,12 +2265,8 @@ static void tidy_up(struct usbduxsub *usbduxsub_tmp)
|
|||
usbduxsub_unlink_OutURBs(usbduxsub_tmp);
|
||||
}
|
||||
for (i = 0; i < usbduxsub_tmp->numOfOutBuffers; i++) {
|
||||
if (usbduxsub_tmp->urbOut[i]->transfer_buffer) {
|
||||
kfree(usbduxsub_tmp->
|
||||
urbOut[i]->transfer_buffer);
|
||||
usbduxsub_tmp->urbOut[i]->transfer_buffer =
|
||||
NULL;
|
||||
}
|
||||
kfree(usbduxsub_tmp->urbOut[i]->transfer_buffer);
|
||||
usbduxsub_tmp->urbOut[i]->transfer_buffer = NULL;
|
||||
if (usbduxsub_tmp->urbOut[i]) {
|
||||
usb_kill_urb(usbduxsub_tmp->urbOut[i]);
|
||||
usb_free_urb(usbduxsub_tmp->urbOut[i]);
|
||||
|
|
Loading…
Reference in New Issue