Merge pull request #7645 from naveenkaje/fix_nrf

Cruz Monrreal · web-flow · commit b4e88392dd7e · 2018-08-15T15:51:21.000-05:00
nrf_drv_twi: remove redundant nrf_drv_disable call in nrf_drv_twi_uninit
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/drivers_nrf/twi_master/nrf_drv_twi.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/drivers_nrf/twi_master/nrf_drv_twi.c
@@ -345,7 +345,6 @@ void nrf_drv_twi_uninit(nrf_drv_twi_t const * p_instance)
             nrf_drv_common_irq_disable(nrf_drv_get_IRQn((void *)p_instance->reg.p_twi));
         )
     }
-    nrf_drv_twi_disable(p_instance);
 
 #if NRF_MODULE_ENABLED(PERIPHERAL_RESOURCE_SHARING)
     nrf_drv_common_per_res_release(p_instance->reg.p_regs);

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,6 @@ void nrf_drv_twi_uninit(nrf_drv_twi_t const * p_instance)`
`345`	`345`	`nrf_drv_common_irq_disable(nrf_drv_get_IRQn((void *)p_instance->reg.p_twi));`
`346`	`346`	`)`
`347`	`347`	`}`
`348`		`- nrf_drv_twi_disable(p_instance);`
`349`	`348`
`350`	`349`	`#if NRF_MODULE_ENABLED(PERIPHERAL_RESOURCE_SHARING)`
`351`	`350`	`nrf_drv_common_per_res_release(p_instance->reg.p_regs);`