Patch "Subject: pinctrl: imx1-core: Fix debug output in .pin_config_set callback" has been added to the 4.1-stable tree

This is a note to let you know that I've just added the patch titled

Subject: pinctrl: imx1-core: Fix debug output in .pin_config_set callback

to the 4.1-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:
subject-pinctrl-imx1-core-fix-debug-output-in-.pin_config_set-callback.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <[email protected]>
Date: Fri, 17 Jul 2015 09:38:43 +0200
Subject: Subject: pinctrl: imx1-core: Fix debug output in .pin_config_set callback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <[email protected]>

commit 9571b25df1dbf4db17191b54f59734e8b77fd591 upstream.

imx1_pinconf_set assumes that the array of pins in struct imx1_pinctrl_soc_info can be indexed by pin id to get the pinctrl_pin_desc for a pin. This used to be correct up to commit 607af165c047 which removed some entries from the array and so made it wrong to access the array by pin id.

The result of this bug is a wrong pin name in the output for small pin ids and an oops for the bigger ones.

This patch is the result of a discussion that includes patches by Markus Pargmann and Chris Ruehl.

---
 drivers/pinctrl/freescale/pinctrl-imx1-core.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

@@ -403,14 +403,13 @@ static int imx1_pinconf_set(struct pinct
 			     unsigned num_configs)
 {
 	struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
-	const struct imx1_pinctrl_soc_info *info = ipctl->info;
 	int i;
 
 	for (i = 0; i != num_configs; ++i) {
 		imx1_write_bit(ipctl, pin_id, configs[i] & 0x01, MX1_PUEN);
 
 		dev_dbg(ipctl->dev, "pinconf set pullup pin %s\n",
-			info->pins[pin_id].name);
+			pin_desc_get(pctldev, pin_id)->name);
 	}
 
 	return 0;

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/genirq-prevent-resend-to-interrupts-marked-irq_nested_thread.patch queue-4.1/subject-pinctrl-imx1-core-fix-debug-output-in-.pin_config_set-callback.patch