Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1499421/?format=api
{ "id": 1499421, "url": "http://patchwork.ozlabs.org/api/patches/1499421/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-pwm/patch/20210701072927.328254-4-u.kleine-koenig@pengutronix.de/", "project": { "id": 38, "url": "http://patchwork.ozlabs.org/api/projects/38/?format=api", "name": "Linux PWM development", "link_name": "linux-pwm", "list_id": "linux-pwm.vger.kernel.org", "list_email": "linux-pwm@vger.kernel.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20210701072927.328254-4-u.kleine-koenig@pengutronix.de>", "list_archive_url": null, "date": "2021-07-01T07:29:27", "name": "[3/3] pwm: Restore initial state if a legacy callback fails", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b0e1c23942aa69848caef5408629355e3f079893", "submitter": { "id": 1476, "url": "http://patchwork.ozlabs.org/api/people/1476/?format=api", "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linux-pwm/patch/20210701072927.328254-4-u.kleine-koenig@pengutronix.de/mbox/", "series": [ { "id": 251456, "url": "http://patchwork.ozlabs.org/api/series/251456/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-pwm/list/?series=251456", "date": "2021-07-01T07:29:25", "name": "pwm: Some improvements for legacy drivers", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/251456/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1499421/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1499421/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<linux-pwm-owner@vger.kernel.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=23.128.96.18; helo=vger.kernel.org;\n envelope-from=linux-pwm-owner@vger.kernel.org; receiver=<UNKNOWN>)", "Received": [ "from vger.kernel.org (vger.kernel.org [23.128.96.18])\n\tby ozlabs.org (Postfix) with ESMTP id 4GFqbh3g8bz9sX5\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 1 Jul 2021 17:29:36 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n id S234733AbhGAHcE (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);\n Thu, 1 Jul 2021 03:32:04 -0400", "from lindbergh.monkeyblade.net ([23.128.96.19]:52748 \"EHLO\n lindbergh.monkeyblade.net\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n with ESMTP id S234635AbhGAHcE (ORCPT\n <rfc822;linux-pwm@vger.kernel.org>); Thu, 1 Jul 2021 03:32:04 -0400", "from metis.ext.pengutronix.de (metis.ext.pengutronix.de\n [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33])\n by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FAD0C0617AE\n for <linux-pwm@vger.kernel.org>; Thu, 1 Jul 2021 00:29:33 -0700 (PDT)", "from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0])\n by metis.ext.pengutronix.de with esmtps\n (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.92)\n (envelope-from <ukl@pengutronix.de>)\n id 1lyr8c-000391-Ou; Thu, 01 Jul 2021 09:29:30 +0200", "from ukl by ptx.hi.pengutronix.de with local (Exim 4.92)\n (envelope-from <ukl@pengutronix.de>)\n id 1lyr8c-0006yA-5B; Thu, 01 Jul 2021 09:29:30 +0200" ], "From": "=?utf-8?q?Uwe_Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>", "To": "Thierry Reding <thierry.reding@gmail.com>,\n Lee Jones <lee.jones@linaro.org>", "Cc": "linux-pwm@vger.kernel.org, kernel@pengutronix.de,\n Geert Uytterhoeven <geert@linux-m68k.org>", "Subject": "[PATCH 3/3] pwm: Restore initial state if a legacy callback fails", "Date": "Thu, 1 Jul 2021 09:29:27 +0200", "Message-Id": "<20210701072927.328254-4-u.kleine-koenig@pengutronix.de>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20210701072927.328254-1-u.kleine-koenig@pengutronix.de>", "References": "<20210701072927.328254-1-u.kleine-koenig@pengutronix.de>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "X-Patch-Hashes": "v=1; h=sha256; i=NKl7qBUDZ4t5WRIxEdUoKhwmGiKzejmC7NB0eOp7sJM=;\n m=VkgWLiZafRShbBgwl+M9ZkcM1pqbPA2BmrjkiU0Ckrc=;\n p=qrgcSIeKy6cUIOC+EtdUMUjaGm9f9sUXBDJRKZszYuQ=;\n g=3631a5b206800449c9da6c96dba155575e518015", "X-Patch-Sig": "m=pgp; i=uwe@kleine-koenig.org;\n s=0x0D2511F322BFAB1C1580266BE2DCDD9132669BD6;\n b=iQEzBAABCgAdFiEEfnIqFpAYrP8+dKQLwfwUeK3K7AkFAmDdbn8ACgkQwfwUeK3K7AlRAwf+NzP\n EnzoTbHITOg/hYZFVb11X4f+S6HfrPY/fHhD1KD3xbGCYmlz1iZhMRP79I3o+vi3TznM40mR8XTub\n bVZYW3Z2u4x7MdsssLNVR1E5GQYfkoFjWXIzaNkUFIo05je6yndc1TpE6qeKhj+/IzghJjuQmEvgM\n 2ggm0v99WYlp9Mzpk9m2VK4XMectn1vVVyl22R5OzlvXRu4MJIe0cKLEtDu2qiXJRN3S10diAr3V2\n 951ScNxhXRA9sn1c9PJRBDV+RdDvHIeHbEhFZP5bQHUg94l/kl1XpA0pSqfCirWNeZlGLnrlSdaMy\n +6G0yyub26fYhVVuz9ujfkLxVN2jLig==", "Content-Transfer-Encoding": "8bit", "X-SA-Exim-Connect-IP": "2001:67c:670:100:1d::c0", "X-SA-Exim-Mail-From": "ukl@pengutronix.de", "X-SA-Exim-Scanned": "No (on metis.ext.pengutronix.de);\n SAEximRunCond expanded to false", "X-PTX-Original-Recipient": "linux-pwm@vger.kernel.org", "Precedence": "bulk", "List-ID": "<linux-pwm.vger.kernel.org>", "X-Mailing-List": "linux-pwm@vger.kernel.org" }, "content": "It is not entirely accurate to go back to the initial state after e.g.\n.enable() failed, as .config() still modified the hardware, but this same\ninconsistency exists for drivers that implement .apply().\n\nSigned-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>\n---\n drivers/pwm/core.c | 14 ++++++++------\n 1 file changed, 8 insertions(+), 6 deletions(-)", "diff": "diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c\nindex 20afe6d0bc5e..6e30ef9b9b79 100644\n--- a/drivers/pwm/core.c\n+++ b/drivers/pwm/core.c\n@@ -539,10 +539,8 @@ static int pwm_apply_legacy(struct pwm_chip *chip, struct pwm_device *pwm,\n \t\t\t const struct pwm_state *state)\n {\n \tint err;\n+\tstruct pwm_state initial_state = pwm->state;\n \n-\t/*\n-\t * FIXME: restore the initial state in case of error.\n-\t */\n \tif (state->polarity != pwm->state.polarity) {\n \t\tif (!chip->ops->set_polarity)\n \t\t\treturn -EINVAL;\n@@ -563,7 +561,7 @@ static int pwm_apply_legacy(struct pwm_chip *chip, struct pwm_device *pwm,\n \n \t\terr = chip->ops->set_polarity(chip, pwm, state->polarity);\n \t\tif (err)\n-\t\t\treturn err;\n+\t\t\tgoto rollback;\n \n \t\tpwm->state.polarity = state->polarity;\n \t}\n@@ -586,7 +584,7 @@ static int pwm_apply_legacy(struct pwm_chip *chip, struct pwm_device *pwm,\n \t\t\t\tstate->duty_cycle,\n \t\t\t\tstate->period);\n \tif (err)\n-\t\treturn err;\n+\t\tgoto rollback;\n \n \tpwm->state.period = state->period;\n \tpwm->state.duty_cycle = state->duty_cycle;\n@@ -594,10 +592,14 @@ static int pwm_apply_legacy(struct pwm_chip *chip, struct pwm_device *pwm,\n \tif (!pwm->state.enabled) {\n \t\terr = chip->ops->enable(chip, pwm);\n \t\tif (err)\n-\t\t\treturn err;\n+\t\t\tgoto rollback;\n \t}\n \n \treturn 0;\n+\n+rollback:\n+\tpwm->state = initial_state;\n+\treturn err;\n }\n \n /**\n", "prefixes": [ "3/3" ] }