diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2011-05-16 14:25:59 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2011-05-26 11:55:02 +0200 |
| commit | ebd669a19f00d0ff8370e1edfb6232f50e42110d (patch) | |
| tree | 8caa87208ed7fab89d3da201d2b2fee26bc04efc /hw/usb-msd.c | |
| parent | 6dfcdccb09b98dff758b31811d1433b11cc9aaa1 (diff) | |
usb-storage: don't call usb_packet_complete twice
usb_msd_copy_data() may cause a recursive call to
usb_msd_command_complete() which in turn may complete
the packet, setting s->packet to NULL in case it does.
Recheck s->packet before calling usb_packet_complete()
to fix the double call.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb-msd.c')
| -rw-r--r-- | hw/usb-msd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/usb-msd.c b/hw/usb-msd.c index c3a197a10c..1064920ac5 100644 --- a/hw/usb-msd.c +++ b/hw/usb-msd.c @@ -253,7 +253,7 @@ static void usb_msd_command_complete(SCSIBus *bus, int reason, uint32_t tag, s->scsi_buf = s->scsi_dev->info->get_buf(s->scsi_dev, tag); if (p) { usb_msd_copy_data(s); - if (s->usb_len == 0) { + if (s->packet && s->usb_len == 0) { /* Set s->packet to NULL before calling usb_packet_complete because another request may be issued before usb_packet_complete returns. */ |