From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch v2] sound/usb/format: silence uninitialized variable warnings Date: Sat, 14 Aug 2010 19:29:53 +0200 Message-ID: <20100814172953.GA645@bicker> References: <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 775AC1037EA for ; Sat, 14 Aug 2010 19:30:26 +0200 (CEST) Received: by fxm11 with SMTP id 11so2398426fxm.38 for ; Sat, 14 Aug 2010 10:30:26 -0700 (PDT) Content-Disposition: inline In-Reply-To: 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: Takashi Iwai Cc: Stephen Rothwell , alsa-devel@alsa-project.org, Clemens Ladisch , kernel-janitors@vger.kernel.org List-Id: alsa-devel@alsa-project.org R2NjIGNvbXBsYWlucyB0aGF0IHJldCBtaWdodCBiZSB1c2VkIHVuaW5pdGlhbGl6ZWQ6Cgpzb3Vu ZC91c2IvZm9ybWF0LmM6IEluIGZ1bmN0aW9uIOKAmHNuZF91c2JfcGFyc2VfYXVkaW9fZm9ybWF0 4oCZOgpzb3VuZC91c2IvZm9ybWF0LmM6MzU0OiB3YXJuaW5nOiDigJhyZXTigJkgbWF5IGJlIHVz ZWQgdW5pbml0aWFsaXplZCBpbiB0aGlzIGZ1bmN0aW9uCnNvdW5kL3VzYi9mb3JtYXQuYzozNTQ6 IG5vdGU6IOKAmHJldOKAmSB3YXMgZGVjbGFyZWQgaGVyZQpzb3VuZC91c2IvZm9ybWF0LmM6NDE0 OiB3YXJuaW5nOiDigJhyZXTigJkgbWF5IGJlIHVzZWQgdW5pbml0aWFsaXplZCBpbiB0aGlzIGZ1 bmN0aW9uCnNvdW5kL3VzYi9mb3JtYXQuYzo0MTQ6IG5vdGU6IOKAmHJldOKAmSB3YXMgZGVjbGFy ZWQgaGVyZQoKSSBzdXBwb3NlIGl0IGNvdWxkIGJlIHVuaW5pdGlhbGl6ZWQgaWYgdGhlcmUgaXMg ZXZlciBhIFVBQ19WRVJTSU9OXzMKcmVsZWFzZWQuIEFueXdheSB0aGlzIHBhdGNoIGlzIHdvcnRo d2hpbGUgaWYgb25seSB0byBzaWxlbmNlIHRoZSBnY2MKd2FybmluZy4KClNpZ25lZC1vZmYtYnk6 IERhbiBDYXJwZW50ZXIgPGVycm9yMjdAZ21haWwuY29tPgotLS0KVjI6IFRvdGFsbHkgZGlmZmVy ZW50LiAgQWRkZWQgcHJpbnRrKClzCgpkaWZmIC0tZ2l0IGEvc291bmQvdXNiL2Zvcm1hdC5jIGIv c291bmQvdXNiL2Zvcm1hdC5jCmluZGV4IDQzODdmNTQuLjNhMTM3NTQgMTAwNjQ0Ci0tLSBhL3Nv dW5kL3VzYi9mb3JtYXQuYworKysgYi9zb3VuZC91c2IvZm9ybWF0LmMKQEAgLTM5Miw2ICszOTIs MTAgQEAgc3RhdGljIGludCBwYXJzZV9hdWRpb19mb3JtYXRfaShzdHJ1Y3Qgc25kX3VzYl9hdWRp byAqY2hpcCwKIAkJLyogZnAtPmNoYW5uZWxzIGlzIGFscmVhZHkgc2V0IGluIHRoaXMgY2FzZSAq LwogCQlyZXQgPSBwYXJzZV9hdWRpb19mb3JtYXRfcmF0ZXNfdjIoY2hpcCwgZnApOwogCQlicmVh azsKKwlkZWZhdWx0OgorCQlzbmRfcHJpbnRrKEtFUk5fRVJSICIlZDoldTolZCA6IGludmFsaWQg cHJvdG9jb2wgdmVyc2lvbiAlZFxuIiwKKwkJCSAgIGNoaXAtPmRldi0+ZGV2bnVtLCBmcC0+aWZh Y2UsIGZwLT5hbHRzZXR0aW5nLCBwcm90b2NvbCk7CisJCXJldHVybiAtRUlOVkFMOwogCX0KIAog CWlmIChmcC0+Y2hhbm5lbHMgPCAxKSB7CkBAIC00NTIsNiArNDU2LDEwIEBAIHN0YXRpYyBpbnQg cGFyc2VfYXVkaW9fZm9ybWF0X2lpKHN0cnVjdCBzbmRfdXNiX2F1ZGlvICpjaGlwLAogCQlyZXQg PSBwYXJzZV9hdWRpb19mb3JtYXRfcmF0ZXNfdjIoY2hpcCwgZnApOwogCQlicmVhazsKIAl9CisJ ZGVmYXVsdDoKKwkJc25kX3ByaW50ayhLRVJOX0VSUiAiJWQ6JXU6JWQgOiBpbnZhbGlkIHByb3Rv Y29sIHZlcnNpb24gJWRcbiIsCisJCQkgICBjaGlwLT5kZXYtPmRldm51bSwgZnAtPmlmYWNlLCBm cC0+YWx0c2V0dGluZywgcHJvdG9jb2wpOworCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKIAlyZXR1 cm4gcmV0OwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpB bHNhLWRldmVsIG1haWxpbmcgbGlzdApBbHNhLWRldmVsQGFsc2EtcHJvamVjdC5vcmcKaHR0cDov L21haWxtYW4uYWxzYS1wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Fsc2EtZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Sat, 14 Aug 2010 17:29:53 +0000 Subject: [patch v2] sound/usb/format: silence uninitialized variable Message-Id: <20100814172953.GA645@bicker> List-Id: References: <20100814085846.GV645@bicker> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: Takashi Iwai Cc: Stephen Rothwell , alsa-devel@alsa-project.org, 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 uninitialized 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 --- V2: Totally different. Added printk()s diff --git a/sound/usb/format.c b/sound/usb/format.c index 4387f54..3a13754 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c @@ -392,6 +392,10 @@ static int parse_audio_format_i(struct snd_usb_audio *chip, /* fp->channels is already set in this case */ ret = parse_audio_format_rates_v2(chip, fp); break; + default: + snd_printk(KERN_ERR "%d:%u:%d : invalid protocol version %d\n", + chip->dev->devnum, fp->iface, fp->altsetting, protocol); + return -EINVAL; } if (fp->channels < 1) { @@ -452,6 +456,10 @@ static int parse_audio_format_ii(struct snd_usb_audio *chip, ret = parse_audio_format_rates_v2(chip, fp); break; } + default: + snd_printk(KERN_ERR "%d:%u:%d : invalid protocol version %d\n", + chip->dev->devnum, fp->iface, fp->altsetting, protocol); + return -EINVAL; } return ret;