Skip to contentSkip to conversation

Patch "usb: phy: Find the right match in devm_usb_phy_match" has been added to the 3.14-stable tree

PATCH [email protected] 1 participant 1 message May 2, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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

usb: phy: Find the right match in devm_usb_phy_match

to the 3.14-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:
usb-phy-find-the-right-match-in-devm_usb_phy_match.patch
and it can be found in the queue-3.14 subdirectory.

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

Quoted 1 line

From 869aee0f31429fa9d94d5aef539602b73ae0cf4b Mon Sep 17 00:00:00 2001

From: Axel Lin <[email protected]>
Date: Thu, 12 Mar 2015 09:15:28 +0800
Subject: usb: phy: Find the right match in devm_usb_phy_match

From: Axel Lin <[email protected]>

commit 869aee0f31429fa9d94d5aef539602b73ae0cf4b upstream.

The res parameter passed to devm_usb_phy_match() is the location where the pointer to the usb_phy is stored, hence it needs to be dereferenced before comparing to the match data in order to find the correct match.

Fixes 410219dcd2ba ("usb: otg: utils: devres: Add API's to associate a device with the phy")
---
 drivers/usb/phy/phy.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/phy/phy.c +3 -1
@@ -78,7 +78,9 @@ static void devm_usb_phy_release(struct
 
 static int devm_usb_phy_match(struct device *dev, void *res, void *match_data)
 {
-	return res == match_data;
+	struct usb_phy **phy = res;
+
+	return *phy == match_data;
 }
 
 /**

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

queue-3.14/usb-phy-find-the-right-match-in-devm_usb_phy_match.patch