aboutsummaryrefslogtreecommitdiff
path: root/hw/nvram/nrf51_nvm.c
diff options
context:
space:
mode:
Diffstat (limited to 'hw/nvram/nrf51_nvm.c')
-rw-r--r--hw/nvram/nrf51_nvm.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/hw/nvram/nrf51_nvm.c b/hw/nvram/nrf51_nvm.c
index ed8b836..73564f7 100644
--- a/hw/nvram/nrf51_nvm.c
+++ b/hw/nvram/nrf51_nvm.c
@@ -336,12 +336,9 @@ static void nrf51_nvm_init(Object *obj)
static void nrf51_nvm_realize(DeviceState *dev, Error **errp)
{
NRF51NVMState *s = NRF51_NVM(dev);
- Error *err = NULL;
- memory_region_init_rom_device(&s->flash, OBJECT(dev), &flash_ops, s,
- "nrf51_soc.flash", s->flash_size, &err);
- if (err) {
- error_propagate(errp, err);
+ if (!memory_region_init_rom_device(&s->flash, OBJECT(dev), &flash_ops, s,
+ "nrf51_soc.flash", s->flash_size, errp)) {
return;
}