diff --git a/dummyflasher.c b/dummyflasher.c
index a5eb10d..88ef112 100644
--- a/dummyflasher.c
+++ b/dummyflasher.c
@@ -124,7 +124,7 @@
 	.write_aai	= default_spi_write_aai,
 };
 
-static struct par_master par_master_dummy = {
+static const struct par_master par_master_dummy = {
 	.chip_readb	= dummy_chip_readb,
 	.chip_readw	= dummy_chip_readw,
 	.chip_readl	= dummy_chip_readl,
@@ -441,7 +441,6 @@
 		return 1;
 	}
 	data->emu_chip = EMULATE_NONE;
-	par_master_dummy.data = data;
 
 	msg_pspew("%s\n", __func__);
 
@@ -497,7 +496,7 @@
 	if (dummy_buses_supported & BUS_NONSPI)
 		register_par_master(&par_master_dummy,
 				    dummy_buses_supported & BUS_NONSPI,
-				    NULL);
+				    data);
 	if (dummy_buses_supported & BUS_SPI)
 		register_spi_master(&spi_master_dummyflasher, data);