From: Markus Armbruster <armbru@redhat.com>
Date: Wed, 16 Jan 2013 17:20:25 +0000 (+0100)
Subject: usb-storage: Drop useless null test in usb_msd_handle_data()
X-Git-Tag: v1.4.0-rc0~166
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1cbfd554e11bb8af38c2f3e1f1574bf4c563cd2;p=thirdparty%2Fqemu.git

usb-storage: Drop useless null test in usb_msd_handle_data()

scsi_req_new() never returns null, and scsi_req_enqueue() dereferences
the pointer, so checking for null is useless.

Spotted by Coverity.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 1b87352db01..b839798eafc 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -427,7 +427,7 @@ static void usb_msd_handle_data(USBDevice *dev, USBPacket *p)
             scsi_req_print(s->req);
 #endif
             scsi_req_enqueue(s->req);
-            if (s->req && s->req->cmd.xfer != SCSI_XFER_NONE) {
+            if (s->req->cmd.xfer != SCSI_XFER_NONE) {
                 scsi_req_continue(s->req);
             }
             break;