diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-23 09:08:33 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-23 09:08:33 -0600 |
| commit | 36ba58044e70a82b93e84b1f31076df847f23109 (patch) | |
| tree | 241d9841582945174151cd81451edb830515f0b1 /hw/usb/hcd-ohci.c | |
| parent | a29a6b73c4f17db6f82fd8d2094e824c04b29fee (diff) | |
| parent | 347073336d393a819928de0d4fd56563134c0e1a (diff) | |
| download | focaccia-qemu-36ba58044e70a82b93e84b1f31076df847f23109.tar.gz focaccia-qemu-36ba58044e70a82b93e84b1f31076df847f23109.zip | |
Merge remote-tracking branch 'kraxel/usb.77' into staging
# By Gerd Hoffmann # Via Gerd Hoffmann * kraxel/usb.77: usb: add usb-bot device (scsi bulk-only transport). ohci: add missing break Revert "usb-storage: Drop useless null test in usb_msd_handle_data()"
Diffstat (limited to 'hw/usb/hcd-ohci.c')
| -rw-r--r-- | hw/usb/hcd-ohci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 6a2f5f8c5d..dd9967b13d 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -1736,6 +1736,7 @@ static void ohci_mem_write(void *opaque, /* PXA27x specific registers */ case 24: /* HcStatus */ ohci->hstatus &= ~(val & ohci->hmask); + break; case 25: /* HcHReset */ ohci->hreset = val & ~OHCI_HRESET_FSBIR; |