From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2C6AC33CAF for ; Thu, 16 Jan 2020 18:46:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8D1472053B for ; Thu, 16 Jan 2020 18:46:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579200415; bh=VgOQDA71uRDSsos4UvyhHQ5aQa7agYA/TfWi29gk9ks=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZL/yaSFRosKHpz1IeM3/Xraie+gT/V1YgmGF5pSwFDUZoVpLfu5wRn44CCd+tq+OQ cYeIe5alWLqcFjY2/HeLOll/Y4q3Ivs1OfZCR9wht7L0TqmEaeljDm/WR3O1i/nBGM XOYNWoVtLzooNxQEOtUf+GG8y1Jquda7GMc4cgzw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389923AbgAPSqy (ORCPT ); Thu, 16 Jan 2020 13:46:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:47628 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389214AbgAPRKJ (ORCPT ); Thu, 16 Jan 2020 12:10:09 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 54A40206D9; Thu, 16 Jan 2020 17:10:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194609; bh=VgOQDA71uRDSsos4UvyhHQ5aQa7agYA/TfWi29gk9ks=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NSfAi41LdOy5J5oEleyFYtRQfZiXQtVdkR5XNgSGjCpW6K7fpDQqD3a5OWODYgIZU sACp05xpJqmC2bdFePD/Hk0ziF80xDCkppITkC4KvwYRCJtDyYq8Y1LSS6eeKmIyMR Y7NK4PDt21DwYbWk//k3u/0fSZf/YovtD+X/ZHBs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , Stephen Rothwell , Takashi Iwai , Sasha Levin , linuxppc-dev@lists.ozlabs.org, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 4.19 475/671] ALSA: aoa: onyx: always initialize register read value Date: Thu, 16 Jan 2020 12:01:53 -0500 Message-Id: <20200116170509.12787-212-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johannes Berg [ Upstream commit f474808acb3c4b30552d9c59b181244e0300d218 ] A lot of places in the driver use onyx_read_register() without checking the return value, and it's been working OK for ~10 years or so, so probably never fails ... Rather than trying to check the return value everywhere, which would be relatively intrusive, at least make sure we don't use an uninitialized value. Fixes: f3d9478b2ce4 ("[ALSA] snd-aoa: add snd-aoa") Reported-by: Stephen Rothwell Signed-off-by: Johannes Berg Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/aoa/codecs/onyx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c index d2d96ca082b7..6224fd3bbf7c 100644 --- a/sound/aoa/codecs/onyx.c +++ b/sound/aoa/codecs/onyx.c @@ -74,8 +74,10 @@ static int onyx_read_register(struct onyx *onyx, u8 reg, u8 *value) return 0; } v = i2c_smbus_read_byte_data(onyx->i2c, reg); - if (v < 0) + if (v < 0) { + *value = 0; return -1; + } *value = (u8)v; onyx->cache[ONYX_REG_CONTROL-FIRSTREGISTER] = *value; return 0; -- 2.20.1