Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-11 15:40:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] remove redundant NULL checks before kfree() in sound/ and avoid casting pointers about to be kfree()'ed

Browse Source 
Checking a pointer for NULL before calling kfree() on it is redundant,
kfree() deals with NULL pointers just fine.
This patch removes such checks from sound/

This patch also makes another, but closely related, change.
It avoids casting pointers about to be kfree()'ed.

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jesper Juhl 2005-06-25 14:58:49 -07:00 committed by Linus Torvalds
parent 4ae6673e02
commit 09417379be
8 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/oss/ad1848.c
View File

@ -2178,8 +2178,7 @@ void ad1848_unload(int io_base, int irq, int dma_playback, int dma_capture, int
if (devc != NULL) if (devc != NULL)
{ {
if(audio_devs[dev]->portc!=NULL) kfree(audio_devs[dev]->portc);
kfree(audio_devs[dev]->portc);
release_region(devc->base, 4); release_region(devc->base, 4);
if (!share_dma) if (!share_dma)

3
sound/oss/ad1889.c
View File

@ -277,8 +277,7 @@ static void ad1889_free_dev(ad1889_dev_t *dev)
for (j = 0; j < AD_MAX_STATES; j++) { for (j = 0; j < AD_MAX_STATES; j++) {
dmabuf = &dev->state[j].dmabuf; dmabuf = &dev->state[j].dmabuf;
if (dmabuf->rawbuf != NULL) kfree(dmabuf->rawbuf);
kfree(dmabuf->rawbuf);
} }
kfree(dev); kfree(dev);

20
sound/oss/dmasound/dmasound_awacs.c
View File

@ -671,14 +671,10 @@ static void PMacIrqCleanup(void)
release_OF_resource(awacs_node, 1); release_OF_resource(awacs_node, 1);
release_OF_resource(awacs_node, 2); release_OF_resource(awacs_node, 2);
if (awacs_tx_cmd_space) kfree(awacs_tx_cmd_space);
kfree(awacs_tx_cmd_space); kfree(awacs_rx_cmd_space);
if (awacs_rx_cmd_space) kfree(beep_dbdma_cmd_space);
kfree(awacs_rx_cmd_space); kfree(beep_buf);
if (beep_dbdma_cmd_space)
kfree(beep_dbdma_cmd_space);
if (beep_buf)
kfree(beep_buf);
#ifdef CONFIG_PMAC_PBOOK #ifdef CONFIG_PMAC_PBOOK
pmu_unregister_sleep_notifier(&awacs_sleep_notifier); pmu_unregister_sleep_notifier(&awacs_sleep_notifier);
#endif #endif
@ -2301,8 +2297,7 @@ if (count <= 0)
#endif #endif
if ((write_sq.max_count + 1) > number_of_tx_cmd_buffers) { if ((write_sq.max_count + 1) > number_of_tx_cmd_buffers) {
if (awacs_tx_cmd_space) kfree(awacs_tx_cmd_space);
kfree(awacs_tx_cmd_space);
number_of_tx_cmd_buffers = 0; number_of_tx_cmd_buffers = 0;
/* we need nbufs + 1 (for the loop) and we should request + 1 /* we need nbufs + 1 (for the loop) and we should request + 1
@ -2360,8 +2355,7 @@ if (count <= 0)
#endif #endif
if ((read_sq.max_count+1) > number_of_rx_cmd_buffers ) { if ((read_sq.max_count+1) > number_of_rx_cmd_buffers ) {
if (awacs_rx_cmd_space) kfree(awacs_rx_cmd_space);
kfree(awacs_rx_cmd_space);
number_of_rx_cmd_buffers = 0; number_of_rx_cmd_buffers = 0;
/* we need nbufs + 1 (for the loop) and we should request + 1 again /* we need nbufs + 1 (for the loop) and we should request + 1 again
@ -2805,7 +2799,7 @@ __init setup_beep(void)
beep_buf = (short *) kmalloc(BEEP_BUFLEN * 4, GFP_KERNEL); beep_buf = (short *) kmalloc(BEEP_BUFLEN * 4, GFP_KERNEL);
if (beep_buf == NULL) { if (beep_buf == NULL) {
printk(KERN_ERR "dmasound_pmac: no memory for beep buffer\n"); printk(KERN_ERR "dmasound_pmac: no memory for beep buffer\n");
if( beep_dbdma_cmd_space ) kfree(beep_dbdma_cmd_space) ; kfree(beep_dbdma_cmd_space) ;
return -ENOMEM ; return -ENOMEM ;
} }
return 0 ; return 0 ;

6
sound/oss/emu10k1/midi.c
View File

@ -523,10 +523,8 @@ void emu10k1_seq_midi_close(int dev)
card = midi_devs[dev]->devc; card = midi_devs[dev]->devc;
emu10k1_mpuout_close(card); emu10k1_mpuout_close(card);
if (card->seq_mididev) { kfree(card->seq_mididev);
kfree(card->seq_mididev); card->seq_mididev = NULL;
card->seq_mididev = NULL;
}
} }
int emu10k1_seq_midi_out(int dev, unsigned char midi_byte) int emu10k1_seq_midi_out(int dev, unsigned char midi_byte)

3
sound/oss/emu10k1/passthrough.c
View File

@ -213,8 +213,7 @@ void emu10k1_pt_stop(struct emu10k1_card *card)
sblive_writeptr(card, SPCS0 + i, 0, pt->old_spcs[i]); sblive_writeptr(card, SPCS0 + i, 0, pt->old_spcs[i]);
} }
pt->state = PT_STATE_INACTIVE; pt->state = PT_STATE_INACTIVE;
if(pt->buf) kfree(pt->buf);
kfree(pt->buf);
} }
} }

2
sound/oss/maestro.c
View File

@ -2356,7 +2356,7 @@ ess_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
} }
rec_return_free: rec_return_free:
if(combbuf) kfree(combbuf); kfree(combbuf);
return ret; return ret;
} }

3
sound/oss/mpu401.c
View File

@ -1240,8 +1240,7 @@ void unload_mpu401(struct address_info *hw_config)
p=mpu401_synth_operations[n]; p=mpu401_synth_operations[n];
sound_unload_mididev(n); sound_unload_mididev(n);
sound_unload_timerdev(hw_config->slots[2]); sound_unload_timerdev(hw_config->slots[2]);
if(p) kfree(p);
kfree(p);
} }
} }

4
sound/oss/sb_common.c
View File

@ -915,8 +915,8 @@ void sb_dsp_unload(struct address_info *hw_config, int sbmpu)
} }
else else
release_region(hw_config->io_base, 16); release_region(hw_config->io_base, 16);
if(detected_devc)
kfree(detected_devc); kfree(detected_devc);
} }
/* /*