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/pn533.h | |
| parent | 79f09fa79cefdd9df40c9c590cc8dda544ebff26 (diff) | |
| download | linux-b16931b13c67f06ca74cc8d02797de480dea348b.tar.gz | |
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/pn533.h')
| -rw-r--r-- | drivers/nfc/pn533/pn533.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nfc/pn533/pn533.h b/drivers/nfc/pn533/pn533.h index ba604f6d93f9..553c7d171fd1 100644 --- a/drivers/nfc/pn533/pn533.h +++ b/drivers/nfc/pn533/pn533.h @@ -228,7 +228,8 @@ struct pn533 *pn533_register_device(u32 device_type, void *phy, struct pn533_phy_ops *phy_ops, struct pn533_frame_ops *fops, - struct device *dev); + struct device *dev, + struct device *parent); void pn533_unregister_device(struct pn533 *priv); void pn533_recv_frame(struct pn533 *dev, struct sk_buff *skb, int status); |