To modify Ixia port numbers and IP in pod.yaml

[kvmfornfv.git] / kernel / drivers / hid / hid-cypress.c

diff --git a/kernel/drivers/hid/hid-cypress.c b/kernel/drivers/hid/hid-cypress.c
index c4ef3bc..1689568 100644 (file)
--- a/kernel/drivers/hid/hid-cypress.c
+++ b/kernel/drivers/hid/hid-cypress.c
@@ -39,15 +39,14 @@ static __u8 *cp_report_fixup(struct hid_device *hdev, __u8 *rdesc,
        if (!(quirks & CP_RDESC_SWAPPED_MIN_MAX))
                return rdesc;
 
+       if (*rsize < 4)
+               return rdesc;
+
        for (i = 0; i < *rsize - 4; i++)
                if (rdesc[i] == 0x29 && rdesc[i + 2] == 0x19) {
-                       __u8 tmp;
-
                        rdesc[i] = 0x19;
                        rdesc[i + 2] = 0x29;
-                       tmp = rdesc[i + 3];
-                       rdesc[i + 3] = rdesc[i + 1];
-                       rdesc[i + 1] = tmp;
+                       swap(rdesc[i + 3], rdesc[i + 1]);
                }
        return rdesc;
 }