From 69c9eb8473b18a56b04a08af2dc4f9aa403b5359 Mon Sep 17 00:00:00 2001
From: Abhinav Kudnar <abhinav.kudnar@espressif.com>
Date: Mon, 21 Aug 2023 17:37:37 +0530
Subject: [PATCH] fix(nimble) : Handled error return value while handling of
 removing RPA list from controller.

---
 nimble/host/src/ble_gap.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nimble/host/src/ble_gap.c b/nimble/host/src/ble_gap.c
index c0956c2ca..f8f5355d1 100644
--- a/nimble/host/src/ble_gap.c
+++ b/nimble/host/src/ble_gap.c
@@ -6452,6 +6452,7 @@ int
 ble_gap_unpair(const ble_addr_t *peer_addr)
 {
 #if NIMBLE_BLE_SM
+    int rc;
     struct ble_hs_conn *conn;
 
     if (!ble_hs_is_enabled()) {
@@ -6471,8 +6472,11 @@ ble_gap_unpair(const ble_addr_t *peer_addr)
 
     ble_hs_unlock();
 
-    ble_hs_pvcy_remove_entry(peer_addr->type,
+    rc = ble_hs_pvcy_remove_entry(peer_addr->type,
                              peer_addr->val);
+    if (rc != 0) {
+       return rc;
+    }
 
     return ble_store_util_delete_peer(peer_addr);
 #else