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

login
register
mail settings
Submitter Markus Armbruster
Date Jan. 10, 2013, 1:33 p.m.
Message ID <1357824805-31574-3-git-send-email-armbru@redhat.com>
Download mbox | patch
Permalink /patch/211005/
State New
Headers show

Comments

Markus Armbruster - Jan. 10, 2013, 1:33 p.m.
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>
---
 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 669fbd2..ea2179f 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;
         }