diff options
| author | Michael Thalmeier <michael.thalmeier@hale.at> | 2016-04-21 16:43:50 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2016-05-09 23:59:18 +0200 |
| commit | b16931b13c67f06ca74cc8d02797de480dea348b (patch) | |
| tree | 11240279a0355fc5f7e485d84fff85a3927d9357 /drivers/nfc/pn533/usb.c | |
| parent | 79f09fa79cefdd9df40c9c590cc8dda544ebff26 (diff) | |
| download | linux-b16931b13c67f06ca74cc8d02797de480dea348b.tar.bz2 | |
NFC: pn533: fix order of initialization
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>
Diffstat (limited to 'drivers/nfc/pn533/usb.c')
| -rw-r--r-- | drivers/nfc/pn533/usb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/nfc/pn533/usb.c b/drivers/nfc/pn533/usb.c index 4f73cbf8ccef..8ca060324b6a 100644 --- a/drivers/nfc/pn533/usb.c +++ b/drivers/nfc/pn533/usb.c @@ -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); |