xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFC: pn533: fix order of initialization

Browse Source 
Correctly call nfc_set_parent_dev before nfc_register_device.
Otherwise the driver will OOPS when being removed.

Signed-off-by: Michael Thalmeier <michael.thalmeier@hale.at>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Michael Thalmeier
2016-04-21 16:43:50 +02:00
committed by Samuel Ortiz
parent 79f09fa79c
commit b16931b13c
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/nfc/pn533/usb.c
View File

@@ -536,7 +536,7 @@ static int pn533_usb_probe(struct usb_interface *interface,
priv = pn533_register_device(id->driver_info, protocols, protocol_type,
phy, &usb_phy_ops, fops,
&phy->udev->dev);
&phy->udev->dev, &interface->dev);
if (IS_ERR(priv)) {
rc = PTR_ERR(priv);
@@ -544,7 +544,6 @@ static int pn533_usb_probe(struct usb_interface *interface,
}
phy->priv = priv;
nfc_set_parent_dev(priv->nfc_dev, &interface->dev);
usb_set_intfdata(interface, phy);