From 8f752b7eee90320691cec6c5485dbe45776c803b 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 changes due to Null pointer dereference

---
 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, 4 insertions(+), 5 deletions(-)

diff --git a/applications/external/avr_isp_programmer/helpers/avr_isp.c b/applications/external/avr_isp_programmer/helpers/avr_isp.c
index 51b4f8846..76e0a80b0 100644
--- a/applications/external/avr_isp_programmer/helpers/avr_isp.c
+++ b/applications/external/avr_isp_programmer/helpers/avr_isp.c
@@ -152,7 +152,6 @@ 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 209551a47..f586e1645 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,10 +198,9 @@ 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 b3c81f3b1..b457e4c27 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,7 +317,6 @@ 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 c6d9d54c8..f60850c84 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,6 +18,7 @@ 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;
@@ -39,6 +40,7 @@ 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);
 }