Patchwork [5/6] usb-host: Drop superfluous null test from usb_host_auto_scan()

login
register
mail settings
Submitter Gerd Hoffmann
Date Jan. 14, 2013, 11:50 a.m.
Message ID <1358164219-14070-6-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/211773/
State New
Headers show

Comments

Gerd Hoffmann - Jan. 14, 2013, 11:50 a.m.
From: Markus Armbruster <armbru@redhat.com>

Coverity points out that port is later passed to usb_host_open(),
which dereferences it.  It actually can't be null: it always points to
usb_host_scan()'s auto port[].  Drop the superfluous port == NULL
test.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/usb/host-linux.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c
index e8e6a42..a498840 100644
--- a/hw/usb/host-linux.c
+++ b/hw/usb/host-linux.c
@@ -1760,7 +1760,7 @@  static int usb_host_auto_scan(void *opaque, int bus_num,
         if (f->addr > 0 && f->addr != addr) {
             continue;
         }
-        if (f->port != NULL && (port == NULL || strcmp(f->port, port) != 0)) {
+        if (f->port != NULL && strcmp(f->port, port) != 0) {
             continue;
         }