Skip to content

Commit

Permalink
NFC: nfcmrvl_usb: use interface as phy device
Browse files Browse the repository at this point in the history
Use the USB-interface rather than parent USB-device device, which is
what this driver binds to, when registering the nci device.

Note that using the right device is important when dealing with device-
managed resources as the interface can be unbound independently of the
parent device.

Also note that private device pointer had already been set by
nfcmrvl_nci_register_dev() so the redundant assignment can therefore be
removed.

Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Johan Hovold authored and Samuel Ortiz committed Jun 18, 2017
1 parent d0607aa commit 0d1ca88
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/nfc/nfcmrvl/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -341,15 +341,13 @@ static int nfcmrvl_probe(struct usb_interface *intf,
init_usb_anchor(&drv_data->deferred);

priv = nfcmrvl_nci_register_dev(NFCMRVL_PHY_USB, drv_data, &usb_ops,
&drv_data->udev->dev, &config);
&intf->dev, &config);
if (IS_ERR(priv))
return PTR_ERR(priv);

drv_data->priv = priv;
drv_data->priv->support_fw_dnld = false;

priv->dev = &drv_data->udev->dev;

usb_set_intfdata(intf, drv_data);

return 0;
Expand Down

0 comments on commit 0d1ca88

Please sign in to comment.