diff --git a/drivers/gpio/gpio_adp5585.c b/drivers/gpio/gpio_adp5585.c
index 3011120726e2d..0bb247cd2b968 100644
--- a/drivers/gpio/gpio_adp5585.c
+++ b/drivers/gpio/gpio_adp5585.c
@@ -76,8 +76,7 @@ static int gpio_adp5585_config(const struct device *dev, gpio_pin_t pin, gpio_fl
 	uint8_t reg_value;
 
 	/* ADP5585 has non-contiguous gpio pin layouts, account for this */
-	if ((pin & cfg->common.port_pin_mask) == 0) {
-		LOG_ERR("pin %d is invalid for this device", pin);
+	if ((BIT(pin) & cfg->common.port_pin_mask) == 0) {
 		return -ENOTSUP;
 	}
 
@@ -194,7 +193,7 @@ static int gpio_adp5585_port_read(const struct device *dev, gpio_port_value_t *v
 
 	/** Read Input Register */
 
-	uint8_t gpi_status_reg;
+	uint8_t gpi_status_reg = ADP5585_GPI_STATUS_A;
 	uint8_t gpi_status_buf[2];
 
 	ret = i2c_write_read_dt(&parent_cfg->i2c_bus, &gpi_status_reg, 1U,
@@ -225,6 +224,11 @@ static int gpio_adp5585_port_write(const struct device *dev, gpio_port_pins_t ma
 	uint8_t reg_value;
 	int ret;
 
+	/* ADP5585 has non-contiguous gpio pin layouts, account for this */
+	if ((mask & cfg->common.port_pin_mask) == 0) {
+		return -ENOTSUP;
+	}
+
 	/* Can't do I2C bus operations from an ISR */
 	if (k_is_in_isr()) {
 		return -EWOULDBLOCK;
@@ -288,8 +292,7 @@ static int gpio_adp5585_pin_interrupt_configure(const struct device *dev, gpio_p
 	}
 
 	/* ADP5585 has non-contiguous gpio pin layouts, account for this */
-	if ((pin & cfg->common.port_pin_mask) == 0) {
-		LOG_ERR("pin %d is invalid for this device", pin);
+	if ((BIT(pin) & cfg->common.port_pin_mask) == 0) {
 		return -ENOTSUP;
 	}