diff --git a/drivers/lcd/ssd1306_base.c b/drivers/lcd/ssd1306_base.c
index ecb4e0c097..9f8360c65e 100644
--- a/drivers/lcd/ssd1306_base.c
+++ b/drivers/lcd/ssd1306_base.c
@@ -927,7 +927,7 @@ static int ssd1306_configuredisplay(struct ssd1306_dev_s *priv)
 
   /* Configure OLED SPI or I/O, must be delayed 1-10ms */
 
-  up_mdelay(5);
+  nxsig_usleep(5000);
 
   /* Configure the device */
 
@@ -1323,7 +1323,7 @@ static int ssd1306_configuredisplay(struct ssd1306_dev_s *priv)
 
   ssd1306_select(priv, false);
 
-  up_mdelay(100);
+  nxsig_usleep(100000);
 
   priv->is_conf = true;
   return OK;
diff --git a/drivers/lcd/ssd1306_i2c.c b/drivers/lcd/ssd1306_i2c.c
index 3b5da437a4..643b6d892d 100644
--- a/drivers/lcd/ssd1306_i2c.c
+++ b/drivers/lcd/ssd1306_i2c.c
@@ -131,7 +131,7 @@ int ssd1306_sendblk(FAR struct ssd1306_dev_s *priv, uint8_t *data, uint8_t len)
 
   msg[0].frequency = CONFIG_SSD1306_I2CFREQ;  /* I2C frequency */
   msg[0].addr      = priv->addr;              /* 7-bit address */
-  msg[0].flags     = 0;                       /* Write transaction, beginning with START */
+  msg[0].flags     = I2C_M_NOSTOP;            /* Write transaction, beginning with START */
   msg[0].buffer    = &transfer_mode;          /* Transfer mode send */
   msg[0].length    = 1;                       /* Send the one byte register address */