1 files changed, 5 insertions, 7 deletions

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 13a0a0590947..940f5acb6694 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -335,14 +335,11 @@ static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, s
         struct hidp_session *session = hid->driver_data;
         int ret;
 
-        switch (report_type) {
-        case HID_FEATURE_REPORT:
-                report_type = HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE;
-                break;
-        case HID_OUTPUT_REPORT:
+        if (report_type == HID_OUTPUT_REPORT) {
                 report_type = HIDP_TRANS_DATA | HIDP_DATA_RTYPE_OUPUT;
-                break;
-        default:
+                return hidp_send_intr_message(session, report_type,
+                                              data, count);
+        } else if (report_type != HID_FEATURE_REPORT) {
                 return -EINVAL;
         }
 
@@ -351,6 +348,7 @@ static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, s
 
         /* Set up our wait, and send the report request to the device. */
         set_bit(HIDP_WAITING_FOR_SEND_ACK, &session->flags);
+        report_type = HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE;
         ret = hidp_send_ctrl_message(session, report_type, data, count);
         if (ret)
                 goto err;