diff --git a/drivers/sensors/lis2dh.c b/drivers/sensors/lis2dh.c
index 003baa390a..b24aa782e3 100644
--- a/drivers/sensors/lis2dh.c
+++ b/drivers/sensors/lis2dh.c
@@ -129,7 +129,7 @@ static int            lis2dh_access(FAR struct lis2dh_dev_s *dev,
                         uint8_t subaddr, FAR uint8_t *buf, int length);
 static int            lis2dh_get_reading(FAR struct lis2dh_dev_s *dev,
                         FAR struct lis2dh_vector_s *res, bool force_read);
-static int            lis2dh_powerdown(FAR struct lis2dh_dev_s  dev);
+static int            lis2dh_powerdown(FAR struct lis2dh_dev_s *dev);
 static int            lis2dh_reboot(FAR struct lis2dh_dev_s *dev);
 static int            lis2dh_poll(FAR struct file *filep,
                         FAR struct pollfd *fds, bool setup);
@@ -326,6 +326,20 @@ static ssize_t lis2dh_read(FAR struct file *filep, FAR char *buffer,
       return -EINVAL;
     }
 
+  err = sem_wait(&priv->devsem);
+  if (err < 0)
+    {
+      return -EINTR;
+    }
+
+  /* Do not allow read() if no SNIOC_WRITESETUP first. */
+
+  if (!priv->setup)
+    {
+      lis2dh_dbg("lis2dh: Read from unconfigured device\n");
+      return -EINVAL;
+    }
+
   flags = enter_critical_section();
 #ifdef LIS2DH_COUNT_INTS
   if (priv->int_pending > 0)
@@ -342,13 +356,6 @@ static ssize_t lis2dh_read(FAR struct file *filep, FAR char *buffer,
   /* Set pointer to first measurement data */
 
   ptr = (FAR struct lis2dh_result *)buffer;
-
-  err = sem_wait(&priv->devsem);
-  if (err < 0)
-    {
-      return -EINTR;
-    }
-
   ptr->header.meas_count = 0;
 
   if (!priv->fifo_used)
@@ -421,9 +428,9 @@ static ssize_t lis2dh_read(FAR struct file *filep, FAR char *buffer,
 
           fifo_num_samples = (buf & ST_LIS2DH_FIFOSR_NUM_SAMP_MASK) + 1;
 
-          if (fifo_num_samples > readcount)
+          if (fifo_num_samples > (readcount - ptr->header.meas_count))
             {
-              fifo_num_samples = readcount;
+              fifo_num_samples = (readcount - ptr->header.meas_count);
             }
 
           ptr->header.meas_count +=
diff --git a/include/nuttx/sensors/lis2dh.h b/include/nuttx/sensors/lis2dh.h
index f9fdd839ca..bede2795c2 100644
--- a/include/nuttx/sensors/lis2dh.h
+++ b/include/nuttx/sensors/lis2dh.h
@@ -109,8 +109,12 @@ extern "C"
 
 /* I1_AOI1 ENABLE for INT2 (-X------) */
 
-#define ST_LIS2DH_CR3_I1_AOI1_ENABLED   0x40   /* AOI1 interrupt on INT1 pin.*/
-#define ST_LIS2DH_CR3_I1_AOI2_ENABLED   0x20   /* AOI2 interrupt on INT1 pin.*/
+#define ST_LIS2DH_CR3_I1_AOI1_ENABLED   0x40   /* AOI1 interrupt on INT1 pin. */
+#define ST_LIS2DH_CR3_I1_AOI2_ENABLED   0x20   /* AOI2 interrupt on INT1 pin. */
+#define ST_LIS2DH_CR3_I1_DRDY1          0x10   /* DRDY1 interrupt on INT1 pin. */
+#define ST_LIS2DH_CR3_I1_DRDY2          0x08   /* DRDY2 interrupt on INT1 pin. */
+#define ST_LIS2DH_CR3_I1_WTM            0x04   /* FIFO Watermark interrupt on INT1 pin. */
+#define ST_LIS2DH_CR3_I1_OVERRUN        0x02   /* FIFO Overrun interrupt on INT1 pin. */
 
 #define ST_LIS2DH_CTRL_REG4             0x23