Received: by 2002:ac0:aed5:0:0:0:0:0 with SMTP id t21csp2276212imb; Mon, 4 Mar 2019 00:30:33 -0800 (PST) X-Google-Smtp-Source: AHgI3IaMqw1gSg4VXsRWlrcbETi2UrWhVA0B7M3pZVv0kdoSUticejehQV6/mU/bbcut9ujbpR9H X-Received: by 2002:a62:7592:: with SMTP id q140mr19013695pfc.164.1551688233650; Mon, 04 Mar 2019 00:30:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551688233; cv=none; d=google.com; s=arc-20160816; b=XE/OBZqjEfSasOE2d6N+amBdjoWdutMb1QIFrlRH/fyRC2X4ag8Sd7L2QLaVmHSqWo DD8qbOVJvC7EmYhhLNDiWLxR9+aSyP7pDIexuzzFQqpE9nx601c6SO68Wrpq0RLtKEOx DMCK68WuWix3DdDE/kMNmDctpJkXH75zhwpLfp5pWHpzXfz3Hvc/6pSbJMAk4NJt8lCf MAzEAiMG+8NzkXYwCcS9AmyjkimnU9WuUEutYYv3p67vokc5ie+5vrOOA3BYVbOPC5yf 6UaloENa63GFLHVRk/CWgXU4AviX4WJOOj/D2ahTGtCDN4aiE5wnd4GlBSqAJkmPmCR8 aDCw== 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=R/4JztF0LWUzNFobuDV93vSEea0ncFktZDM7LCtaGec=; b=u0rE3iC9vmoM8nu47OXWWDkLbigcneCKf7Sf7bJeYfp53eqW7s9OdJ9MTTVDsTpgNw fE5tSV+s5YUZ5W9y2q8UatBjQ2xx3vY8H/hvoUiIsYEQz/pdx/pSaFX+nYALYrTrf5ah vY6N0iaRyLyfS7V3pyXnxkClPmK11w/GL8cKzsaae1o8g4MlOcZeHhEpghpId3tCmKQN iZkrPIh2VMAzIjQBFWb6Fw3eVKKfpw6fogS7D6zRaOII3SnamgOtFCFUqDroeIhWfIWT WlxPZIMGU6kmjnjBoCY7cGtBWMrcLPY66JAFpyi/BTE9dhPmB3VT8K2fDR86l5rCR2yP bZMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yEJEkduJ; 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 d12si4825014plo.143.2019.03.04.00.30.18; Mon, 04 Mar 2019 00:30:33 -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=yEJEkduJ; 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 S1727362AbfCDI2H (ORCPT + 99 others); Mon, 4 Mar 2019 03:28:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:52670 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727340AbfCDI2A (ORCPT ); Mon, 4 Mar 2019 03:28:00 -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 62A2220836; Mon, 4 Mar 2019 08:27:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551688079; bh=uKx5i3vKS0GeF/yUflMcRlNzLFZx7yPBGWbdtr6j/l0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yEJEkduJTzVbvgngc1ZUBK8nXY8GyNg3UXuubXB9BdxiExvNgziZl5V38Xvskr2Yw AHvQ2CwQ2A4N6MTjAY+L6iMMCqQdAd0Sjsmbz6eNr2IAjH/Hj+17/TvmuKREnzrQB5 83uZQGYm7oXLDTHL+G1XcHdTDzOOOtMTwLm0ttak= 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.19 11/78] clk: sysfs: fix invalid JSON in clk_dump Date: Mon, 4 Mar 2019 09:21:54 +0100 Message-Id: <20190304081626.002791078@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190304081625.508788074@linuxfoundation.org> References: <20190304081625.508788074@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.19-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 d31055ae6ec6f..5413ffaf02e23 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -2687,7 +2687,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