drivers: usb_dc_nrfx: Do not uninit on detach (22168bd4) · Commits · Wenxi XU / zephyr

drivers/usb/device/usb_dc_nrfx.c

+7 −11

Changes for drivers/usb/device/usb_dc_nrfx.c: 7 added lines, 11 removed lines.
Original line number	Diff line number	Diff line
		@@ -1264,7 +1264,6 @@ static void usbd_work_handler(struct k_work *item)
		int usb_dc_attach(void)
		{
		struct nrf_usbd_ctx *ctx = get_usbd_ctx();
		nrfx_err_t err;
		int ret;

		if (ctx->attached) {
		@@ -1281,12 +1280,6 @@ int usb_dc_attach(void)
		IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority),
		nrfx_isr, nrfx_usbd_irq_handler, 0);

		err = nrfx_usbd_init(usbd_event_handler);

		if (err != NRFX_SUCCESS) {
		LOG_DBG("nRF USBD driver init failed. Code: %d", (uint32_t)err);
		return -EIO;
		}
		nrfx_power_usbevt_enable();

		ret = eps_ctx_init();
		@@ -1324,10 +1317,6 @@ int usb_dc_detach(void)
		nrfx_usbd_disable();
		}

		if (nrfx_usbd_is_initialized()) {
		nrfx_usbd_uninit();
		}

		(void)hfxo_stop(ctx);
		nrfx_power_usbevt_disable();

		@@ -1883,6 +1872,7 @@ int usb_dc_wakeup_request(void)
		static int usb_init(const struct device *arg)
		{
		struct nrf_usbd_ctx *ctx = get_usbd_ctx();
		nrfx_err_t err;

		#ifdef CONFIG_HAS_HW_NRF_USBREG
		/* Use CLOCK/POWER priority for compatibility with other series where
		@@ -1907,6 +1897,12 @@ static int usb_init(const struct device *arg)
		.handler = usb_dc_power_event_handler
		};

		err = nrfx_usbd_init(usbd_event_handler);
		if (err != NRFX_SUCCESS) {
		LOG_DBG("nRF USBD driver init failed. Code: %d", (uint32_t)err);
		return -EIO;
		}

		/* Ignore the return value, as NRFX_ERROR_ALREADY_INITIALIZED is not
		* a problem here.
		*/