Merge branches 'acpica', 'acpi-video' and 'acpi-fan'

[cascardo/linux.git] / net / nfc / nci / core.c

diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 10c99a5..fbb7a2b 100644 (file)
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -610,14 +610,14 @@ int nci_core_conn_create(struct nci_dev *ndev, u8 destination_type,
        struct nci_core_conn_create_cmd *cmd;
        struct core_conn_create_data data;
 
+       if (!number_destination_params)
+               return -EINVAL;
+
        data.length = params_len + sizeof(struct nci_core_conn_create_cmd);
        cmd = kzalloc(data.length, GFP_KERNEL);
        if (!cmd)
                return -ENOMEM;
 
-       if (!number_destination_params)
-               return -EINVAL;
-
        cmd->destination_type = destination_type;
        cmd->number_destination_params = number_destination_params;
        memcpy(cmd->params, params, params_len);