From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 11 Aug 2009 06:15:04 +0000 (+0200)
Subject: ALSA: usb-audio - Fix types taken in min()
X-Git-Tag: v2.6.32-rc1~732^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=f1e6d3c5cf86675e54a17a89668aa6685d2ef59d

ALSA: usb-audio - Fix types taken in min()

Fix the compile warning due to different integer types used in min():
  sound/usb/usbaudio.c: In function 'init_substream_urbs':
  sound/usb/usbaudio.c:1087: warning: comparison of distinct pointer types lacks a cast

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index fa3f7a1dc5e1..5149c5893eaa 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -1084,7 +1084,7 @@ static int init_substream_urbs(struct snd_usb_substream *subs, unsigned int peri
 		urb_packs = 1;
 	urb_packs *= packs_per_ms;
 	if (subs->syncpipe)
-		urb_packs = min(urb_packs, 1 << subs->syncinterval);
+		urb_packs = min(urb_packs, 1U << subs->syncinterval);
 
 	/* decide how many packets to be used */
 	if (is_playback) {