From patchwork Tue Apr 11 19:15:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 97276 Delivered-To: patches@linaro.org Received: by 10.140.109.52 with SMTP id k49csp101784qgf; Tue, 11 Apr 2017 12:15:25 -0700 (PDT) X-Received: by 10.98.218.76 with SMTP id w12mr62591301pfl.162.1491938125631; Tue, 11 Apr 2017 12:15:25 -0700 (PDT) Return-Path: Received: from mail-pg0-x22c.google.com (mail-pg0-x22c.google.com. [2607:f8b0:400e:c05::22c]) by mx.google.com with ESMTPS id d5si17702370pgh.317.2017.04.11.12.15.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Apr 2017 12:15:25 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::22c as permitted sender) client-ip=2607:f8b0:400e:c05::22c; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::22c as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-pg0-x22c.google.com with SMTP id 21so3012197pgg.1 for ; Tue, 11 Apr 2017 12:15:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=jfpda2ER7naUCkUKqVQexkhR05gatZqhT5PJ0yOqHj0=; b=O58UK7Uq3FmwFEY7PUX9/5oPrk/xcg/q0o7l9qUf9Y0KZmSA3MN26eFjqaQIrY9q2Y LqbvWSgWXRN6kFxeYFFqBmweK/FKKBbONk78zuragMRCwJaNABiDjAJVnwWSxzVH+gvP JF1Sri/lXsmFaK0a8itHs7RxSZ1F0PTwtssag= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jfpda2ER7naUCkUKqVQexkhR05gatZqhT5PJ0yOqHj0=; b=Vu1Udag1PoVEjLG4ELGbz2kNjmBNstwjfale/6eTYEd+8g4T+7CtDs00pBCSY3lfvf 8cRwJr9xD04Xdb0aLYl6sNtVN6vN/ogSL8aAK0a/5BtmPawb1A5Mg+23CPu910oev2GU VTJBWYl8Tma1T1Qz7AaXz8VQoOFZbItY2XVB1R/ffCaGR4SlrgCV6OXcT9wcIYAnIAr0 M8yfEOszzCOkwqT/iorVR/OHF+AWZqANwfwCxCyqd6A/z//XqzwzU9yCaIzG0jcDwamK bTsFFjFDlWDWkDqY0Z4VXLbYcnbpMRUvsSYnv4btvwiduSLNCBCdT60Uz3EXXH1UpyWS 0Nzw== X-Gm-Message-State: AFeK/H36UZYxdmDwV+9Imu4h4seBf0Mzu9XRqGHQGzJCAYAfE4aDDzWU6vUWFmsOH2iFmcZcW4k= X-Received: by 10.84.239.8 with SMTP id w8mr77101704plk.73.1491938125262; Tue, 11 Apr 2017 12:15:25 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id y184sm32033726pgd.41.2017.04.11.12.15.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Apr 2017 12:15:24 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Zhangfei Gao , Liam Girdwood , Mark Brown , Jaroslav Kysela , Wei Xu , Rob Herring , Andy Green , Dave Long , Guodong Xu Subject: [PATCH 1/3] ASoC: hisilicon: Add error returns even for cases that shouldn't happen. Date: Tue, 11 Apr 2017 12:15:16 -0700 Message-Id: <1491938118-19108-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 This patch addresses feedback from Mark Brown, adding a few extra error returns in cases that shouldn't happen Cc: Zhangfei Gao Cc: Liam Girdwood Cc: Mark Brown Cc: Jaroslav Kysela Cc: Wei Xu Cc: Rob Herring Cc: Andy Green Cc: Dave Long Cc: Guodong Xu Signed-off-by: John Stultz --- sound/soc/hisilicon/hi6210-i2s.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.7.4 diff --git a/sound/soc/hisilicon/hi6210-i2s.c b/sound/soc/hisilicon/hi6210-i2s.c index 45691b70..1909bfc 100644 --- a/sound/soc/hisilicon/hi6210-i2s.c +++ b/sound/soc/hisilicon/hi6210-i2s.c @@ -395,6 +395,7 @@ static int hi6210_i2s_hw_params(struct snd_pcm_substream *substream, break; default: WARN_ONCE(1, "Invalid i2s->fmt MASTER_MASK. This shouldn't happen\n"); + return -EINVAL; } switch (i2s->format & SND_SOC_DAIFMT_FORMAT_MASK) { @@ -409,6 +410,7 @@ static int hi6210_i2s_hw_params(struct snd_pcm_substream *substream, break; default: WARN_ONCE(1, "Invalid i2s->fmt FORMAT_MASK. This shouldn't happen\n"); + return -EINVAL; } val = hi6210_read_reg(i2s, HII2S_I2S_CFG);