From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752652AbdCPOUj (ORCPT ); Thu, 16 Mar 2017 10:20:39 -0400 Received: from mga01.intel.com ([192.55.52.88]:40666 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751712AbdCPOUi (ORCPT ); Thu, 16 Mar 2017 10:20:38 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,172,1486454400"; d="scan'208";a="1109188247" From: Andy Shevchenko To: Lee Jones , linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v1] mfd: core: Preserve PLATFORM_DEVID_NONE Date: Thu, 16 Mar 2017 16:19:59 +0200 Message-Id: <20170316141959.16018-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is a potential flaw if cell has id > 0 and is going to be registered with PLATFORM_DEVID_NONE. Ignore if PLATFORM_DEVID_NONE is supplied. Signed-off-by: Andy Shevchenko --- drivers/mfd/mfd-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index c57e407020f1..c9583f895058 100644 --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c @@ -149,7 +149,7 @@ static int mfd_add_device(struct device *parent, int id, int platform_id; int r; - if (id == PLATFORM_DEVID_AUTO) + if (id < 0) platform_id = id; else platform_id = id + cell->id; -- 2.11.0