diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-07-26 17:05:55 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-07-26 17:05:55 -0400 |
commit | e5036c2575b244851637a81efc4104c076c4fa21 (patch) | |
tree | 5d8d5dd0a768b77bda3299ea565c7444c26ed6f1 /drivers/nfc/pn533.c | |
parent | 41bf37117b47fc5ce2aae91f6a108e7e42e0b046 (diff) | |
parent | 5bc91db8933bce07c3af86da2bd956414aa5a725 (diff) | |
download | talos-obmc-linux-e5036c2575b244851637a81efc4104c076c4fa21.tar.gz talos-obmc-linux-e5036c2575b244851637a81efc4104c076c4fa21.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/nfc/pn533.c')
-rw-r--r-- | drivers/nfc/pn533.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c index 037231540719..c77e0543e502 100644 --- a/drivers/nfc/pn533.c +++ b/drivers/nfc/pn533.c @@ -1596,7 +1596,7 @@ static void pn533_disconnect(struct usb_interface *interface) usb_free_urb(dev->out_urb); kfree(dev); - nfc_dev_info(&dev->interface->dev, "NXP PN533 NFC device disconnected"); + nfc_dev_info(&interface->dev, "NXP PN533 NFC device disconnected"); } static struct usb_driver pn533_driver = { |