From patchwork Fri Oct 5 16:13:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 148220 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp640203lji; Fri, 5 Oct 2018 09:14:39 -0700 (PDT) X-Google-Smtp-Source: ACcGV615ZdZ7q3g2cQ7qJfodG4RBVBZJoLJaZkN494xM4koWwGWFeSVcmv2IrUJs1UwIWXPgAqiA X-Received: by 2002:a17:902:be18:: with SMTP id r24-v6mr839509pls.341.1538756078788; Fri, 05 Oct 2018 09:14:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538756078; cv=none; d=google.com; s=arc-20160816; b=iwiXP8b+1x9hmuoUoBBkHS9LY3T3apsDlx+OTHlb6Jz64QyYxLkaifAAzM2F5xZkth xpisBpDMtKebaONjpd2CC3g+jknAd0LJhk2dcHV9fFcCaM6PAVcru291UBhI0jMwy71L D0n7DYCuYEUPfKrEH6rmn0ZK+rsEIdGYAxN0mIsJjy5DrByK66WPrGObZntsvBBWQeqR 0ebl3G4RAaaQZk/pCyKOGPbsrrOxTOfpXy88FA0NKFbJvK/1drzyADShbTIcCeSHArMN RM0CSP8H8phMztyAGPmqeE5J0atFntjnOvHZyE2qXRbgXHuCVS5rVB1X+mc67VrmpJi5 KpKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=hePC8lZVi7F5CQnWBxeiAkGCGW7BpVM78uR6WH8sB2o=; b=OV16lvZiQs0Kf8qtXhKpsePTgdKqMIaF1KNWNxqCkJh5AJe+z/69zIFJrwVYm1aQgT I8T18hkhCEVvyFaliibgGlbar5orfDst5RXG9ewBYgTzaptinh5nFf6TsUxaVTOY735t 8t0f1H4+ZLCisJ1HWt6tNdHXNy2oLbkTONWrbU2Ja/Wbc+ZR2oCXrhBcJKEOVVTHgWp9 swMgszf1XDkuUH14Q8WDEx34Wuj0Bo7wtGs18IWAfgMGor2MeGJAqQbbHXE3IEeTzMz1 3O4mLodSqCUhLP2m/VTXAbBlE26MYqQX5XCBxovxfXJuK/4M58t9elSXRqw7vOWq73gD jGiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CbZEFu+9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x15-v6si8963716pln.425.2018.10.05.09.14.38; Fri, 05 Oct 2018 09:14:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CbZEFu+9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729082AbeJEXN6 (ORCPT + 32 others); Fri, 5 Oct 2018 19:13:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:50896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727958AbeJEXN4 (ORCPT ); Fri, 5 Oct 2018 19:13:56 -0400 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 CD0C42148D; Fri, 5 Oct 2018 16:14:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1538756074; bh=2CHOi86Myddl7TisdRqK1y06+D1TqKxm2Ker6sGEr1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CbZEFu+9WyuNaUGi8rkWRN7YwJCprspdIAGjYPjEEG8SGGsEXYZObf3dkhmGzkJpa LOaV5DMKH0/75PdnB0HrJ54p0e5TFeAdn8LRl7z0Jcr6zvnFMKQZjZSbauHLIrG6zR tPkp7wOXHyAbQojs2oU1Q4JKkqTeFt2ZX4aDCyO8= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Srinivas Kandagatla , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 4.18 09/48] ASoC: q6routing: initialize data correctly Date: Fri, 5 Oct 2018 12:13:45 -0400 Message-Id: <20181005161424.20521-9-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181005161424.20521-1-sashal@kernel.org> References: <20181005161424.20521-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Srinivas Kandagatla [ Upstream commit 7aa09ff24301535491cd4de1b93107ee91449a12 ] Some of the router data fields are left as default zeros which are valid dai ids, so initialize these to invalid value of -1. Without intializing these correctly get_session_from_id() can return incorrect session resulting in not closing the opened copp and messing up with the copp ref count. Fixes: e3a33673e845 ("ASoC: qdsp6: q6routing: Add q6routing driver") Signed-off-by: Srinivas Kandagatla Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/qcom/qdsp6/q6routing.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c index 593f66b8622f..33bb97c0b6b6 100644 --- a/sound/soc/qcom/qdsp6/q6routing.c +++ b/sound/soc/qcom/qdsp6/q6routing.c @@ -933,8 +933,10 @@ static int msm_routing_probe(struct snd_soc_component *c) { int i; - for (i = 0; i < MAX_SESSIONS; i++) + for (i = 0; i < MAX_SESSIONS; i++) { routing_data->sessions[i].port_id = -1; + routing_data->sessions[i].fedai_id = -1; + } return 0; }