diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index 6d27a5b5e3ca..7ffcda94d323 100644
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -761,12 +761,12 @@ static int tps6598x_probe(struct i2c_client *client)

    ret = tps6598x_read32(tps, TPS_REG_STATUS, &status);
    if (ret < 0)
-       return ret;
+       goto err_clear_mask;
    trace_tps6598x_status(status);

    ret = tps6598x_read32(tps, TPS_REG_SYSTEM_CONF, &conf);
    if (ret < 0)
-       return ret;
+       goto err_clear_mask;

    /*
     * This fwnode has a "compatible" property, but is never populated as a
@@ -855,7 +855,8 @@ static int tps6598x_probe(struct i2c_client *client)
    usb_role_switch_put(tps->role_sw);
 err_fwnode_put:
    fwnode_handle_put(fwnode);
-
+err_clear_mask:
+   tps6598x_write64(tps, TPS_REG_INT_MASK1, 0);
    return ret;
 }