diff --git a/[refs] b/[refs]
index 78b25086110a..193db421caea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07887e92205c5808820de0be53bf326b4019d060
+refs/heads/master: 23f7e6d0d060e2eb0be1daef818d030025453b44
diff --git a/trunk/net/nfc/hci/core.c b/trunk/net/nfc/hci/core.c
index bc571b0efb92..a58db89b4555 100644
--- a/trunk/net/nfc/hci/core.c
+++ b/trunk/net/nfc/hci/core.c
@@ -38,6 +38,8 @@ static int nfc_hci_result_to_errno(u8 result)
 	switch (result) {
 	case NFC_HCI_ANY_OK:
 		return 0;
+	case NFC_HCI_ANY_E_REG_PAR_UNKNOWN:
+		return -EOPNOTSUPP;
 	case NFC_HCI_ANY_E_TIMEOUT:
 		return -ETIME;
 	default:
@@ -419,6 +421,10 @@ static int hci_dev_version(struct nfc_hci_dev *hdev)
 
 	r = nfc_hci_get_param(hdev, NFC_HCI_ID_MGMT_GATE,
 			      NFC_HCI_ID_MGMT_VERSION_SW, &skb);
+	if (r == -EOPNOTSUPP) {
+		pr_info("Software/Hardware info not available\n");
+		return 0;
+	}
 	if (r < 0)
 		return r;