Changes in uspace/drv/nic/ar9271/wmi.c [2298fc4:3bacee1] in mainline

File:

• uspace/drv/nic/ar9271/wmi.c (modified) (4 diffs)

uspace/drv/nic/ar9271/wmi.c

@@ -230 +230 @@
         size_t buffer_size = header_size + command_length;
         void *buffer = malloc(buffer_size);
-        if (buffer == NULL) {
-                usb_log_error("Failed to allocate WMI message buffer (out of memory).\n");
-                return ENOMEM;
-        }
 
         if (command_buffer != NULL)
@@ -245 +241 @@
             host2uint16_t_be(++htc_device->sequence_number);
 
-        /* Send message (buffer will not be needed afterwards regardless of result). */
+        /* Send message. */
         errno_t rc = htc_send_control_message(htc_device, buffer, buffer_size,
             htc_device->endpoints.wmi_endpoint);
+        if (rc != EOK) {
+                free(buffer);
+                usb_log_error("Failed to send WMI message. Error: %s\n", str_error_name(rc));
+                return rc;
+        }
+
         free(buffer);
-        if (rc != EOK) {
-                usb_log_error("Failed to send WMI message. Error: %s\n", str_error_name(rc));
-                return rc;
-        }
 
         bool clean_resp_buffer = false;
@@ -269 +267 @@
                     response_buffer_size, NULL);
                 if (rc != EOK) {
+                        free(buffer);
                         usb_log_error("Failed to receive WMI message response. "
                             "Error: %s\n", str_error_name(rc));
@@ -276 +275 @@
                 if (response_buffer_size < sizeof(htc_frame_header_t) +
                     sizeof(wmi_command_header_t)) {
+                        free(buffer);
                         usb_log_error("Corrupted response received.\n");
                         return EINVAL;