Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d1ca88b authored by Johan Hovold's avatar Johan Hovold Committed by Samuel Ortiz
Browse files

NFC: nfcmrvl_usb: use interface as phy device 



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: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent d0607aa4

drivers/nfc/nfcmrvl/usb.c

+1 −3
Original line number Diff line number Diff line
@@ -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;