Author: manu
Date: Thu Nov 28 20:17:03 2019
New Revision: 355190
URL: https://svnweb.freebsd.org/changeset/base/355190

Log:
  arm64: rockchip: tsadc: Do not free the sysctl context is it wasn't created
  
  MFC after:    3 weeks
  X-MFC-With:   r355173

Modified:
  head/sys/arm64/rockchip/rk_tsadc.c

Modified: head/sys/arm64/rockchip/rk_tsadc.c
==============================================================================
--- head/sys/arm64/rockchip/rk_tsadc.c  Thu Nov 28 20:09:19 2019        
(r355189)
+++ head/sys/arm64/rockchip/rk_tsadc.c  Thu Nov 28 20:17:03 2019        
(r355190)
@@ -728,16 +728,17 @@ tsadc_attach(device_t dev)
        rv = tsadc_init_sysctl(sc);
        if (rv != 0) {
                device_printf(sc->dev, "Cannot initialize sysctls\n");
-               goto fail;
+               goto fail_sysctl;
        }
 
        OF_device_register_xref(OF_xref_from_node(node), dev);
        return (bus_generic_attach(dev));
 
+fail_sysctl:
+       sysctl_ctx_free(&tsadc_sysctl_ctx);
 fail:
        if (sc->irq_ih != NULL)
                bus_teardown_intr(dev, sc->irq_res, sc->irq_ih);
-       sysctl_ctx_free(&tsadc_sysctl_ctx);
        if (sc->tsadc_clk != NULL)
                clk_release(sc->tsadc_clk);
        if (sc->apb_pclk_clk != NULL)
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to