diff options
author | Axel Lin <axel.lin@ingics.com> | 2015-03-11 21:15:28 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2015-03-19 12:28:14 -0400 |
commit | 869aee0f31429fa9d94d5aef539602b73ae0cf4b (patch) | |
tree | a246791e0060470cd8951d6c3139303e272b9373 | |
parent | 467a78c82ad5f9a3e3c80eb4ba17de6bb70e4f9b (diff) |
usb: phy: Find the right match in devm_usb_phy_match
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")
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Cc: <stable@vger.kernel.org> # v3.6+
Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r-- | drivers/usb/phy/phy.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c index 2f9735b35338..d1cd6b50f520 100644 --- a/drivers/usb/phy/phy.c +++ b/drivers/usb/phy/phy.c | |||
@@ -81,7 +81,9 @@ static void devm_usb_phy_release(struct device *dev, void *res) | |||
81 | 81 | ||
82 | static int devm_usb_phy_match(struct device *dev, void *res, void *match_data) | 82 | static int devm_usb_phy_match(struct device *dev, void *res, void *match_data) |
83 | { | 83 | { |
84 | return res == match_data; | 84 | struct usb_phy **phy = res; |
85 | |||
86 | return *phy == match_data; | ||
85 | } | 87 | } |
86 | 88 | ||
87 | /** | 89 | /** |