|
@@ -342,9 +342,10 @@ static int mei_nfc_send(struct mei_cl_device *cldev, u8 *buf, size_t length)
|
|
|
ndev = (struct mei_nfc_dev *) cldev->priv_data;
|
|
|
dev = ndev->cl->dev;
|
|
|
|
|
|
+ err = -ENOMEM;
|
|
|
mei_buf = kzalloc(length + MEI_NFC_HEADER_SIZE, GFP_KERNEL);
|
|
|
if (!mei_buf)
|
|
|
- return -ENOMEM;
|
|
|
+ goto out;
|
|
|
|
|
|
hdr = (struct mei_nfc_hci_hdr *) mei_buf;
|
|
|
hdr->cmd = MEI_NFC_CMD_HCI_SEND;
|
|
@@ -354,12 +355,9 @@ static int mei_nfc_send(struct mei_cl_device *cldev, u8 *buf, size_t length)
|
|
|
hdr->data_size = length;
|
|
|
|
|
|
memcpy(mei_buf + MEI_NFC_HEADER_SIZE, buf, length);
|
|
|
-
|
|
|
err = __mei_cl_send(ndev->cl, mei_buf, length + MEI_NFC_HEADER_SIZE);
|
|
|
if (err < 0)
|
|
|
- return err;
|
|
|
-
|
|
|
- kfree(mei_buf);
|
|
|
+ goto out;
|
|
|
|
|
|
if (!wait_event_interruptible_timeout(ndev->send_wq,
|
|
|
ndev->recv_req_id == ndev->req_id, HZ)) {
|
|
@@ -368,7 +366,8 @@ static int mei_nfc_send(struct mei_cl_device *cldev, u8 *buf, size_t length)
|
|
|
} else {
|
|
|
ndev->req_id++;
|
|
|
}
|
|
|
-
|
|
|
+out:
|
|
|
+ kfree(mei_buf);
|
|
|
return err;
|
|
|
}
|
|
|
|