Received: by 2002:ac0:aed5:0:0:0:0:0 with SMTP id t21csp2281909imb; Mon, 4 Mar 2019 00:41:38 -0800 (PST) X-Google-Smtp-Source: APXvYqzoX8Fe5ZYR9wrFxl1EkzL7B7GC33VCAoA2LrGsZ53Bh+e1QXL1t8rWxKIeCdkqchNrkwaW X-Received: by 2002:a63:c307:: with SMTP id c7mr17653314pgd.386.1551688898459; Mon, 04 Mar 2019 00:41:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551688898; cv=none; d=google.com; s=arc-20160816; b=P2Aldk0Wi5JVt+mSiD2x0n/LRGLvv8XAVb6KZulLhyQDpUAtKC89IEHdjZnhyQyz80 OVueDdVBtDe1kU0qF9TB78F1pulPSLB5tQ+wFdC+uLpgCqdALTUaUbbx9BIop8h5LiOK nsoKbQmsUM43kAHTfjL1SUHdYgZIAELhOiW8N28rFClNnzh6N1P8GhwJFrW+DveXvx1W WeN+YcBDuxEho/JrRO+0H6BJia18sj0dRt3l11Mb/frawAqdOB1hrZfA9pfr0qLRy3kw m43z4pFh9+eVyc6FvVU24BigbpSF/hONb79x1zR/q61Zh+ZnI/JxvQOFS2lID9HIrtzC T7UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VGisUwz+JgP+Ql0ktiWOk7JJgkHZmO39qmivCpE868E=; b=ox+EHbZluTpSvfPQ+DxjP19YlEthESGUuftxNkZudYwCi7qQFzntBM++VnjmfJPSYm /Why5hYXYdAyX8Wkrp9cmQq4NxunOgxeh6lSQs4AnDgNInOepCatSbv67DcU3sFZhcPK zCaXb7yiFw2lziQ2W7oHrusoBStcs2RynyLt93+N4VlbH4yitJyCerbyG2VEe/PRUjwL Ett+lKwzJr8HGpDfgV3ALHwAMeS7I/e6qRf+N+6YZL+dFzv38m75PWJcp4IYM0oOWSCD b6e4vYTn+gzO0QavmSmnT7pj0+kFKk0vyqOnUZFZayVuFDEc7lwWg8/bx5M+qZibeo10 rcLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oGefwLiT; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si4820714pgu.300.2019.03.04.00.41.20; Mon, 04 Mar 2019 00:41:38 -0800 (PST) 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=oGefwLiT; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727777AbfCDIcd (ORCPT + 99 others); Mon, 4 Mar 2019 03:32:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:35884 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727311AbfCDIc1 (ORCPT ); Mon, 4 Mar 2019 03:32:27 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B7C5620836; Mon, 4 Mar 2019 08:32:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551688347; bh=dd5Z2ZNq/DDq+GKImDvcaYjblrVbycI7iSuRzQ7S8zA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oGefwLiTXBA8dVBx1yv1ePME2EYU9kkZZvovQqiqM+QbELAZcbMIcguD7OqWZsGQB 8fX1gZBYXjX4utPDs/+aXsvpB2mCzWq3GMtdZsZ80GexpRZmcg94iT3H1mXib70UeQ ldRr1AgQ+wpo9leh5I3SkDg+wi6USub+EDk0MqmU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lubomir Rintel , Stephen Boyd , Sasha Levin Subject: [PATCH 4.20 09/88] clk: sysfs: fix invalid JSON in clk_dump Date: Mon, 4 Mar 2019 09:21:52 +0100 Message-Id: <20190304081630.936249978@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190304081630.610632175@linuxfoundation.org> References: <20190304081630.610632175@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit c6e909972ef87aa2a479269f46b84126f99ec6db ] Add a missing comma so that the output is valid JSON format again. Fixes: 9fba738a53dd ("clk: add duty cycle support") Signed-off-by: Lubomir Rintel Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- drivers/clk/clk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index af011974d4ecb..2bcd9cb26348c 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -2782,7 +2782,7 @@ static void clk_dump_one(struct seq_file *s, struct clk_core *c, int level) seq_printf(s, "\"protect_count\": %d,", c->protect_count); seq_printf(s, "\"rate\": %lu,", clk_core_get_rate(c)); seq_printf(s, "\"accuracy\": %lu,", clk_core_get_accuracy(c)); - seq_printf(s, "\"phase\": %d", clk_core_get_phase(c)); + seq_printf(s, "\"phase\": %d,", clk_core_get_phase(c)); seq_printf(s, "\"duty_cycle\": %u", clk_core_get_scaled_duty_cycle(c, 100000)); } -- 2.19.1