From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch] sound/usb/format: silence uninitialized variable warnings Date: Sat, 14 Aug 2010 10:58:47 +0200 Message-ID: <20100814085846.GV645@bicker> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-fx0-f51.google.com (mail-fx0-f51.google.com [209.85.161.51]) by alsa0.perex.cz (Postfix) with ESMTP id 89DD324431 for ; Sat, 14 Aug 2010 10:59:53 +0200 (CEST) Received: by fxm11 with SMTP id 11so2276533fxm.38 for ; Sat, 14 Aug 2010 01:59:53 -0700 (PDT) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Jaroslav Kysela Cc: Stephen Rothwell , alsa-devel@alsa-project.org, Takashi Iwai , Clemens Ladisch , kernel-janitors@vger.kernel.org List-Id: alsa-devel@alsa-project.org R2NjIGNvbXBsYWlucyB0aGF0IHJldCBtaWdodCBiZSB1c2VkIHVuaW5pdGlhbGl6ZWQ6Cgpzb3Vu ZC91c2IvZm9ybWF0LmM6IEluIGZ1bmN0aW9uIOKAmHNuZF91c2JfcGFyc2VfYXVkaW9fZm9ybWF0 4oCZOgpzb3VuZC91c2IvZm9ybWF0LmM6MzU0OiB3YXJuaW5nOiDigJhyZXTigJkgbWF5IGJlIHVz ZWQgdW5pbml0aWFsaXplZCBpbiB0aGlzIGZ1bmN0aW9uCnNvdW5kL3VzYi9mb3JtYXQuYzozNTQ6 IG5vdGU6IOKAmHJldOKAmSB3YXMgZGVjbGFyZWQgaGVyZQpzb3VuZC91c2IvZm9ybWF0LmM6NDE0 OiB3YXJuaW5nOiDigJhyZXTigJkgbWF5IGJlIHVzZWQgdW5pbml0aWFsaXplZCBpbiB0aGlzIGZ1 bmN0aW9uCnNvdW5kL3VzYi9mb3JtYXQuYzo0MTQ6IG5vdGU6IOKAmHJldOKAmSB3YXMgZGVjbGFy ZWQgaGVyZQoKSSBzdXBwb3NlIGl0IGNvdWxkIGJlIGlmIHRoZXJlIGlzIGV2ZXIgYSBVQUNfVkVS U0lPTl8zIHJlbGVhc2VkLiBBbnl3YXkKdGhpcyBwYXRjaCBpcyB3b3J0aHdoaWxlIGlmIG9ubHkg dG8gc2lsZW5jZSB0aGUgZ2NjIHdhcm5pbmcuCgpTaWduZWQtb2ZmLWJ5OiBEYW4gQ2FycGVudGVy IDxlcnJvcjI3QGdtYWlsLmNvbT4KCmRpZmYgLS1naXQgYS9zb3VuZC91c2IvZm9ybWF0LmMgYi9z b3VuZC91c2IvZm9ybWF0LmMKaW5kZXggNDM4N2Y1NC4uMTQwMDE3NCAxMDA2NDQKLS0tIGEvc291 bmQvdXNiL2Zvcm1hdC5jCisrKyBiL3NvdW5kL3VzYi9mb3JtYXQuYwpAQCAtMzUxLDcgKzM1MSw4 IEBAIHN0YXRpYyBpbnQgcGFyc2VfYXVkaW9fZm9ybWF0X2koc3RydWN0IHNuZF91c2JfYXVkaW8g KmNoaXAsCiB7CiAJc3RydWN0IHVzYl9pbnRlcmZhY2VfZGVzY3JpcHRvciAqYWx0c2QgPSBnZXRf aWZhY2VfZGVzYyhpZmFjZSk7CiAJaW50IHByb3RvY29sID0gYWx0c2QtPmJJbnRlcmZhY2VQcm90 b2NvbDsKLQlpbnQgcGNtX2Zvcm1hdCwgcmV0OworCWludCBwY21fZm9ybWF0OworCWludCByZXQg PSAtRUlOVkFMOwogCiAJaWYgKGZtdC0+YkZvcm1hdFR5cGUgPT0gVUFDX0ZPUk1BVF9UWVBFX0lJ SSkgewogCQkvKiBGSVhNRTogdGhlIGZvcm1hdCB0eXBlIGlzIHJlYWxseSBJRUN4eHgKQEAgLTQx MSw5ICs0MTIsMTAgQEAgc3RhdGljIGludCBwYXJzZV9hdWRpb19mb3JtYXRfaWkoc3RydWN0IHNu ZF91c2JfYXVkaW8gKmNoaXAsCiAJCQkJIGludCBmb3JtYXQsIHZvaWQgKl9mbXQsCiAJCQkJIHN0 cnVjdCB1c2JfaG9zdF9pbnRlcmZhY2UgKmlmYWNlKQogewotCWludCBicmF0ZSwgZnJhbWVzaXpl LCByZXQ7CisJaW50IGJyYXRlLCBmcmFtZXNpemU7CiAJc3RydWN0IHVzYl9pbnRlcmZhY2VfZGVz Y3JpcHRvciAqYWx0c2QgPSBnZXRfaWZhY2VfZGVzYyhpZmFjZSk7CiAJaW50IHByb3RvY29sID0g YWx0c2QtPmJJbnRlcmZhY2VQcm90b2NvbDsKKwlpbnQgcmV0ID0gLUVJTlZBTDsKIAogCXN3aXRj aCAoZm9ybWF0KSB7CiAJY2FzZSBVQUNfRk9STUFUX1RZUEVfSUlfQUMzOgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpBbHNhLWRldmVsIG1haWxpbmcgbGlz dApBbHNhLWRldmVsQGFsc2EtcHJvamVjdC5vcmcKaHR0cDovL21haWxtYW4uYWxzYS1wcm9qZWN0 Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Fsc2EtZGV2ZWwK 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: