From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Sat, 14 Aug 2010 08:58:47 +0000 Subject: [patch] sound/usb/format: silence uninitialized variable warnings Message-Id: <20100814085846.GV645@bicker> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: Jaroslav Kysela Cc: Stephen Rothwell , alsa-devel@alsa-project.org, Takashi Iwai , Clemens Ladisch , kernel-janitors@vger.kernel.org Gcc complains that ret might be used uninitialized: sound/usb/format.c: In function ‘snd_usb_parse_audio_format’: sound/usb/format.c:354: warning: ‘ret’ may be used uninitialized in this function sound/usb/format.c:354: note: ‘ret’ was declared here sound/usb/format.c:414: warning: ‘ret’ may be used uninitialized in this function sound/usb/format.c:414: note: ‘ret’ was declared here I suppose it could be if there is ever a UAC_VERSION_3 released. Anyway this patch is worthwhile if only to silence the gcc warning. Signed-off-by: Dan Carpenter diff --git a/sound/usb/format.c b/sound/usb/format.c index 4387f54..1400174 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c @@ -351,7 +351,8 @@ static int parse_audio_format_i(struct snd_usb_audio *chip, { struct usb_interface_descriptor *altsd = get_iface_desc(iface); int protocol = altsd->bInterfaceProtocol; - int pcm_format, ret; + int pcm_format; + int ret = -EINVAL; if (fmt->bFormatType = UAC_FORMAT_TYPE_III) { /* FIXME: the format type is really IECxxx @@ -411,9 +412,10 @@ static int parse_audio_format_ii(struct snd_usb_audio *chip, int format, void *_fmt, struct usb_host_interface *iface) { - int brate, framesize, ret; + int brate, framesize; struct usb_interface_descriptor *altsd = get_iface_desc(iface); int protocol = altsd->bInterfaceProtocol; + int ret = -EINVAL; switch (format) { case UAC_FORMAT_TYPE_II_AC3: