From: Colin Ian King <colin.king@canonical.com>
Date: Sat, 2 Mar 2019 22:23:38 +0000 (+0000)
Subject: HID: uclogic: remove redudant duplicated null check on ver_ptr
X-Git-Tag: v5.1-rc4~25^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cbbd85fbcdce186649ce778ff1e08e3df35d285;p=thirdparty%2Fkernel%2Flinux.git

HID: uclogic: remove redudant duplicated null check on ver_ptr

Currently ver_ptr is being null checked twice, once before calling
usb_string and once afterwards.  The second null check is redundant
and can be removed, remove it.

Detected by CoverityScan, CID#1477308 ("Logically dead code")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---

diff --git a/drivers/hid/hid-uclogic-params.c b/drivers/hid/hid-uclogic-params.c
index 7710d9f957da5..0187c9f8fc22c 100644
--- a/drivers/hid/hid-uclogic-params.c
+++ b/drivers/hid/hid-uclogic-params.c
@@ -735,10 +735,6 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
 		goto cleanup;
 	}
 	rc = usb_string(udev, 201, ver_ptr, ver_len);
-	if (ver_ptr == NULL) {
-		rc = -ENOMEM;
-		goto cleanup;
-	}
 	if (rc == -EPIPE) {
 		*ver_ptr = '\0';
 	} else if (rc < 0) {