Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20150616' into staging

[qemu.git] / hw / sd / omap_mmc.c

diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index 86c477d720f5b9f13a160005dc3d8495990058c0..d072deca118ea09a56f0d01bb9848a1cc17127c9 100644 (file)
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -406,7 +406,8 @@ static void omap_mmc_write(void *opaque, hwaddr offset,
     struct omap_mmc_s *s = (struct omap_mmc_s *) opaque;
 
     if (size != 2) {
-        return omap_badwidth_write16(opaque, offset, value);
+        omap_badwidth_write16(opaque, offset, value);
+        return;
     }
 
     switch (offset) {