Commit 29174103 authored Jan 10, 2019 by Peter Maydell

Merge remote-tracking branch 'remotes/kraxel/tags/audio-20190110-pull-request' into staging



audio: two fixes.

# gpg: Signature made Thu 10 Jan 2019 09:23:24 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/audio-20190110-pull-request:
  usb-audio: ignore usb packages with wrong size
  hw/audio/marvell: Don't include unnecessary i2c.h header file

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parents a311f891 a7fde1c1

hw/usb/dev-audio.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -321,6 +321,9 @@ static int streambuf_put(struct streambuf buf, USBPacket p)
		if (!free) {
		return 0;
		}
		if (p->iov.size != USBAUDIO_PACKET_SIZE) {
		return 0;
		}
		assert(free >= USBAUDIO_PACKET_SIZE);
		usb_packet_copy(p, buf->data + (buf->prod % buf->size),
		USBAUDIO_PACKET_SIZE);