[PATCH] Remove pointless code from ALSA emu10k1 midi driver.

[PATCH] Remove pointless code from ALSA emu10k1 midi driver.

[Dave Jones]

Spotted with the source checker from Coverity.com.

Signed-off-by: Dave Jones <davej@redhat.com>


diff -urpN --exclude-from=/home/davej/.exclude bk-linus/sound/oss/emu10k1/midi.c linux-2.6/sound/oss/emu10k1/midi.c
--- bk-linus/sound/oss/emu10k1/midi.c	2004-08-09 13:12:18.000000000 +0100
+++ linux-2.6/sound/oss/emu10k1/midi.c	2004-08-23 14:08:26.000000000 +0100
@@ -320,7 +320,6 @@ static ssize_t emu10k1_midi_write(struct
 {
 	struct emu10k1_mididevice *midi_dev = (struct emu10k1_mididevice *) file->private_data;
 	struct midi_hdr *midihdr;
-	ssize_t ret = 0;
 	unsigned long flags;
 
 	DPD(4, "emu10k1_midi_write(), count=%#x\n", (u32) count);
@@ -344,7 +343,7 @@ static ssize_t emu10k1_midi_write(struct
 	if (copy_from_user(midihdr->data, buffer, count)) {
 		kfree(midihdr->data);
 		kfree(midihdr);
-		return ret ? ret : -EFAULT;
+		return -EFAULT;
 	}
 
 	spin_lock_irqsave(&midi_spinlock, flags);

Re: [PATCH] Remove pointless code from ALSA emu10k1 midi driver.

[Takashi Iwai]

Well it's not ALSA emu10k1 but OSS ;)

Takashi


At Wed, 1 Sep 2004 16:51:22 +0100,
Dave Jones wrote:
> 
> Spotted with the source checker from Coverity.com.
> 
> Signed-off-by: Dave Jones <davej@redhat.com>
> 
> 
> diff -urpN --exclude-from=/home/davej/.exclude bk-linus/sound/oss/emu10k1/midi.c linux-2.6/sound/oss/emu10k1/midi.c
> --- bk-linus/sound/oss/emu10k1/midi.c	2004-08-09 13:12:18.000000000 +0100
> +++ linux-2.6/sound/oss/emu10k1/midi.c	2004-08-23 14:08:26.000000000 +0100
> @@ -320,7 +320,6 @@ static ssize_t emu10k1_midi_write(struct
>  {
>  	struct emu10k1_mididevice *midi_dev = (struct emu10k1_mididevice *) file->private_data;
>  	struct midi_hdr *midihdr;
> -	ssize_t ret = 0;
>  	unsigned long flags;
>  
>  	DPD(4, "emu10k1_midi_write(), count=%#x\n", (u32) count);
> @@ -344,7 +343,7 @@ static ssize_t emu10k1_midi_write(struct
>  	if (copy_from_user(midihdr->data, buffer, count)) {
>  		kfree(midihdr->data);
>  		kfree(midihdr);
> -		return ret ? ret : -EFAULT;
> +		return -EFAULT;
>  	}
>  
>  	spin_lock_irqsave(&midi_spinlock, flags);
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>