diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-19 14:10:20 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-19 14:10:20 +0000 |
| commit | 7a9a5e72e8a62395649a46c53c3c224cc73ca52f (patch) | |
| tree | a90264b150c50d8183b0674607f40e23d62ccf27 /hw/misc/omap_sdrc.c | |
| parent | d88aec88cdd2cdb1939b88a8cdab0a5da3c4559b (diff) | |
| parent | 8ce1ee4618f4a557959f5a5731f6726b30416df5 (diff) | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-03-19' into staging
trivial patches for 2015-03-19
# gpg: Signature made Thu Mar 19 08:57:54 2015 GMT using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2015-03-19: (24 commits)
qga/commands-posix: Fix resource leak
elf-loader: Add missing error handling for call of lseek
elf-loader: Fix truncation warning from coverity
hmp: Fix texinfo documentation
Fix typos in comments
qtest/ahci: Fix a bit mask expression
vl: fix resource leak with monitor_fdset_add_fd
smbios: add max speed comdline option for type-17 (meory device) structure
pc-dimm: Add description for device list.
configure: enable kvm on x32
error: Replace error_report() & error_free() with error_report_err()
arm: fix memory leak
qmp: Drop unused .user_print from command definitions
hmp: Fix definition of command quit
target-moxie: Fix warnings from Sparse (one-bit signed bitfield)
block/qapi: Fix Sparse warning
Fix remaining warnings from Sparse (void return)
qom: Fix warning from Sparse
target-mips: Fix warning from Sparse
arm/nseries: Fix warnings from Sparse
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/omap_sdrc.c')
| -rw-r--r-- | hw/misc/omap_sdrc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/misc/omap_sdrc.c b/hw/misc/omap_sdrc.c index ed62caf03f..3de0c0e9d0 100644 --- a/hw/misc/omap_sdrc.c +++ b/hw/misc/omap_sdrc.c @@ -92,7 +92,8 @@ static void omap_sdrc_write(void *opaque, hwaddr addr, struct omap_sdrc_s *s = (struct omap_sdrc_s *) opaque; if (size != 4) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } switch (addr) { |