aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2011-11-21 11:41:30 +0100
committerGerd Hoffmann <kraxel@redhat.com>2011-11-21 14:08:07 +0100
commit414c460431036bdadea8120d056c7e493bb60fb9 (patch)
treebdeea043d17e4396ac9670fd317b5e446b2ba40f /hw
parent7b863f41de0c0089c2735e3caa8952bb3b0a5a7c (diff)
usb-storage: drop result from device state.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/usb-msd.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index 089c23c692..6f32a0ecc7 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -59,7 +59,6 @@ typedef struct {
char *serial;
SCSIDevice *scsi_dev;
uint32_t removable;
- int result;
/* For async completion. */
USBPacket *packet;
} MSDState;
@@ -231,12 +230,11 @@ static void usb_msd_command_complete(SCSIRequest *req, uint32_t status)
DPRINTF("Command complete %d tag 0x%x\n", status, req->tag);
s->residue = s->data_len;
- s->result = status != 0;
s->csw.sig = cpu_to_le32(0x53425355);
s->csw.tag = cpu_to_le32(req->tag);
s->csw.residue = s->residue;
- s->csw.status = s->result;
+ s->csw.status = status != 0;
if (s->packet) {
if (s->data_len == 0 && s->mode == USB_MSDM_DATAOUT) {