Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c095191 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

ALSA: vx222: Fix invalid endian conversions 



commit fff71a4c050ba46e305d910c837b99ba1728135e upstream.

The endian conversions used in vx2_dma_read() and vx2_dma_write() are
superfluous and even wrong on big-endian machines, as inl() and outl()
already do conversions.  Kill them.

Spotted by sparse, a warning like:
  sound/pci/vx222/vx222_ops.c:278:30: warning: incorrect type in argument 1 (different base types)

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2ccea620

sound/pci/vx222/vx222_ops.c

+4 −4
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static void vx2_dma_write(struct vx_core *chip, struct snd_pcm_runtime *runtime, 
		length >>= 2; /* in 32bit words */

		/* Transfer using pseudo-dma. */

		for (; length > 0; length--) {

			outl(cpu_to_le32(*addr), port);

			outl(*addr, port);

			addr++;

		}

		addr = (u32 *)runtime->dma_area;
@@ -280,7 +280,7 @@ static void vx2_dma_write(struct vx_core *chip, struct snd_pcm_runtime *runtime, 
	count >>= 2; /* in 32bit words */

	/* Transfer using pseudo-dma. */

	for (; count > 0; count--) {

		outl(cpu_to_le32(*addr), port);

		outl(*addr, port);

		addr++;

	}
@@ -308,7 +308,7 @@ static void vx2_dma_read(struct vx_core *chip, struct snd_pcm_runtime *runtime, 
		length >>= 2; /* in 32bit words */

		/* Transfer using pseudo-dma. */

		for (; length > 0; length--)

			*addr++ = le32_to_cpu(inl(port));

			*addr++ = inl(port);

		addr = (u32 *)runtime->dma_area;

		pipe->hw_ptr = 0;

	}
@@ -316,7 +316,7 @@ static void vx2_dma_read(struct vx_core *chip, struct snd_pcm_runtime *runtime, 
	count >>= 2; /* in 32bit words */

	/* Transfer using pseudo-dma. */

	for (; count > 0; count--)

		*addr++ = le32_to_cpu(inl(port));

		*addr++ = inl(port);



	vx2_release_pseudo_dma(chip);

}