ret = geni_se_resources_on(&gi2c->se);
        if (ret) {
                dev_err(dev, "Error turning on resources %d\n", ret);
+               clk_disable_unprepare(gi2c->core_clk);
                return ret;
        }
        proto = geni_se_read_proto(&gi2c->se);
                /* FIFO is disabled, so we can only use GPI DMA */
                gi2c->gpi_mode = true;
                ret = setup_gpi_dma(gi2c);
-               if (ret)
+               if (ret) {
+                       geni_se_resources_off(&gi2c->se);
+                       clk_disable_unprepare(gi2c->core_clk);
                        return dev_err_probe(dev, ret, "Failed to setup GPI DMA mode\n");
+               }
 
                dev_dbg(dev, "Using GPI DMA mode for I2C\n");
        } else {
 
                if (!tx_depth) {
                        dev_err(dev, "Invalid TX FIFO depth\n");
+                       geni_se_resources_off(&gi2c->se);
+                       clk_disable_unprepare(gi2c->core_clk);
                        return -EINVAL;
                }