From c2fa8a2b184e0cb86770c0b3092aa1833de3f37e Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Mon, 10 Apr 2023 18:47:20 +0300
Subject: [PATCH] Revert "Revert changes due to Null pointer dereference"

This reverts commit 8f752b7eee90320691cec6c5485dbe45776c803b.
---
 applications/external/avr_isp_programmer/helpers/avr_isp.c   | 1 +
 .../external/avr_isp_programmer/helpers/avr_isp_worker_rw.c  | 5 +++--
 .../external/avr_isp_programmer/lib/driver/avr_isp_prog.c    | 1 +
 .../external/avr_isp_programmer/lib/driver/avr_isp_spi_sw.c  | 2 --
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/applications/external/avr_isp_programmer/helpers/avr_isp.c b/applications/external/avr_isp_programmer/helpers/avr_isp.c
index 76e0a80b0..51b4f8846 100644
--- a/applications/external/avr_isp_programmer/helpers/avr_isp.c
+++ b/applications/external/avr_isp_programmer/helpers/avr_isp.c
@@ -152,6 +152,7 @@ bool avr_isp_auto_set_spi_speed_start_pmode(AvrIsp* instance) {
             }
         }
     }
+    if(instance->spi) avr_isp_spi_sw_free(instance->spi);
     return false;
 }
 
diff --git a/applications/external/avr_isp_programmer/helpers/avr_isp_worker_rw.c b/applications/external/avr_isp_programmer/helpers/avr_isp_worker_rw.c
index f586e1645..209551a47 100644
--- a/applications/external/avr_isp_programmer/helpers/avr_isp_worker_rw.c
+++ b/applications/external/avr_isp_programmer/helpers/avr_isp_worker_rw.c
@@ -198,9 +198,10 @@ bool avr_isp_worker_rw_detect_chip(AvrIspWorkerRW* instance) {
         }
         avr_isp_end_pmode(instance->avr_isp);
 
-        furi_hal_pwm_stop(FuriHalPwmOutputIdLptim2PA4);
-
     } while(0);
+
+    furi_hal_pwm_stop(FuriHalPwmOutputIdLptim2PA4);
+
     if(instance->callback) {
         if(instance->chip_arr_ind > avr_isp_chip_arr_size) {
             instance->callback(instance->context, "No detect", instance->chip_detect, 0);
diff --git a/applications/external/avr_isp_programmer/lib/driver/avr_isp_prog.c b/applications/external/avr_isp_programmer/lib/driver/avr_isp_prog.c
index b457e4c27..b3c81f3b1 100644
--- a/applications/external/avr_isp_programmer/lib/driver/avr_isp_prog.c
+++ b/applications/external/avr_isp_programmer/lib/driver/avr_isp_prog.c
@@ -317,6 +317,7 @@ static bool avr_isp_prog_auto_set_spi_speed_start_pmode(AvrIspProg* instance) {
             }
         }
     }
+    if(instance->spi) avr_isp_spi_sw_free(instance->spi);
     return false;
 }
 
diff --git a/applications/external/avr_isp_programmer/lib/driver/avr_isp_spi_sw.c b/applications/external/avr_isp_programmer/lib/driver/avr_isp_spi_sw.c
index f60850c84..c6d9d54c8 100644
--- a/applications/external/avr_isp_programmer/lib/driver/avr_isp_spi_sw.c
+++ b/applications/external/avr_isp_programmer/lib/driver/avr_isp_spi_sw.c
@@ -18,7 +18,6 @@ struct AvrIspSpiSw {
 AvrIspSpiSw* avr_isp_spi_sw_init(AvrIspSpiSwSpeed speed) {
     AvrIspSpiSw* instance = malloc(sizeof(AvrIspSpiSw));
     instance->speed_wait_time = speed;
-
     instance->miso = AVR_ISP_SPI_SW_MISO;
     instance->mosi = AVR_ISP_SPI_SW_MOSI;
     instance->sck = AVR_ISP_SPI_SW_SCK;
@@ -40,7 +39,6 @@ void avr_isp_spi_sw_free(AvrIspSpiSw* instance) {
     furi_hal_gpio_init(instance->miso, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
     furi_hal_gpio_init(instance->mosi, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
     furi_hal_gpio_init(instance->sck, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
-
     free(instance);
 }