From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753759AbcEINWf (ORCPT ); Mon, 9 May 2016 09:22:35 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:37033 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753497AbcEINUv (ORCPT ); Mon, 9 May 2016 09:20:51 -0400 From: Pantelis Antoniou To: Rob Herring Cc: Frank Rowand , Matt Porter , Koen Kooi , Guenter Roeck , Marek Vasut , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Pantelis Antoniou , Pantelis Antoniou Subject: [PATCH 1/4] of: dynamic: changeset prop-update revert fix Date: Mon, 9 May 2016 16:20:42 +0300 Message-Id: <1462800045-10943-2-git-send-email-pantelis.antoniou@konsulko.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1462800045-10943-1-git-send-email-pantelis.antoniou@konsulko.com> References: <1462800045-10943-1-git-send-email-pantelis.antoniou@konsulko.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When reverting an update property changeset entry that created a property the reverse operation is a remove property and not an update. Signed-off-by: Pantelis Antoniou --- drivers/of/dynamic.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index c647bd1..4145b44 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -497,6 +497,11 @@ static void __of_changeset_entry_invert(struct of_changeset_entry *ce, case OF_RECONFIG_UPDATE_PROPERTY: rce->old_prop = ce->prop; rce->prop = ce->old_prop; + /* update was used but original property did not exist */ + if (!rce->prop) { + rce->action = OF_RECONFIG_REMOVE_PROPERTY; + rce->prop = ce->prop; + } break; } } -- 1.7.12