From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:41749 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751244AbbEBOdB (ORCPT ); Sat, 2 May 2015 10:33:01 -0400 Subject: Patch "mfd: core: Fix platform-device name collisions" has been added to the 3.19-stable tree To: johan@kernel.org, b.zolnierkie@samsung.com, gregkh@linuxfoundation.org, lee.jones@linaro.org Cc: , From: Date: Sat, 02 May 2015 16:32:50 +0200 Message-ID: <143057717058100@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled mfd: core: Fix platform-device name collisions to the 3.19-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mfd-core-fix-platform-device-name-collisions.patch and it can be found in the queue-3.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From a77c50b44cfb663ad03faba9800fec19bdf83577 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Wed, 25 Mar 2015 12:07:05 +0100 Subject: mfd: core: Fix platform-device name collisions From: Johan Hovold commit a77c50b44cfb663ad03faba9800fec19bdf83577 upstream. Since commit 6e3f62f0793e ("mfd: core: Fix platform-device id generation") we honour PLATFORM_DEVID_AUTO and PLATFORM_DEVID_NONE when registering mfd-devices. Unfortunately, some mfd-drivers rely on the old behaviour of generating platform-device ids by adding the cell id also to the special value of PLATFORM_DEVID_NONE. The resulting platform ids are not only used to generate device-unique names, but are also used instead of the cell id to identify cells when probing subdevices. These drivers should be updated to use PLATFORM_DEVID_AUTO, which would also allow more than one device to be registered without resorting to hacks (see for example wm831x), but lets fix the regression first by partially reverting the above mentioned commit with respect to PLATFORM_DEVID_NONE. Fixes: 6e3f62f0793e ("mfd: core: Fix platform-device id generation") Reported-by: Bartlomiej Zolnierkiewicz Signed-off-by: Johan Hovold Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Lee Jones Signed-off-by: Greg Kroah-Hartman --- drivers/mfd/mfd-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c @@ -128,7 +128,7 @@ static int mfd_add_device(struct device int platform_id; int r; - if (id < 0) + if (id == PLATFORM_DEVID_AUTO) platform_id = id; else platform_id = id + cell->id; Patches currently in stable-queue which might be from johan@kernel.org are queue-3.19/mfd-core-fix-platform-device-name-collisions.patch queue-3.19/arm-at91-dt-sama5d3-xplained-add-phy-address-for-macb1.patch