1 files changed, 23 insertions, 24 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus/0001-Revert-server-Check-return-code-for-sd_bus_add_objec.patch b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus/0001-Revert-server-Check-return-code-for-sd_bus_add_objec.patch
index 7b483550c..9aaf2f952 100644
--- a/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus/0001-Revert-server-Check-return-code-for-sd_bus_add_objec.patch
+++ b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus/0001-Revert-server-Check-return-code-for-sd_bus_add_objec.patch
@@ -1,35 +1,34 @@
-From d2a418f554ebe3438181c97f2800d36f17295c1f Mon Sep 17 00:00:00 2001
+From baff58f6e8f7aef4fd56be959fdd2e5e3c429eef Mon Sep 17 00:00:00 2001
 From: Johnathan Mantey <johnathanx.mantey@intel.com>
 Date: Mon, 13 Jul 2020 11:51:54 -0700
 Subject: [PATCH] Revert "server: Check return code for
  sd_bus_add_object_vtable()"
 
 This reverts commit 017a19da5f67a74daedf4d63111569902d4764e6.
-
-%% original patch: 0001-Revert-server-Check-return-code-for-sd_bus_add_objec.patch
 ---
- include/sdbusplus/server/interface.hpp | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
+ src/server/interface.cpp | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
 
-diff --git a/include/sdbusplus/server/interface.hpp b/include/sdbusplus/server/interface.hpp
-index acf4a09..36e89de 100644
---- a/include/sdbusplus/server/interface.hpp
-+++ b/include/sdbusplus/server/interface.hpp
-@@ -64,12 +64,8 @@ struct interface final
-         _interface_added(false)
-     {
-         sd_bus_slot* slot = nullptr;
--        int r = _intf->sd_bus_add_object_vtable(
--            _bus.get(), &slot, _path.c_str(), _interf.c_str(), vtable, context);
--        if (r < 0)
--        {
--            throw exception::SdBusError(-r, "sd_bus_add_object_vtable");
--        }
-+        _intf->sd_bus_add_object_vtable(_bus.get(), &slot, _path.c_str(),
-+                                        _interf.c_str(), vtable, context);
+diff --git a/src/server/interface.cpp b/src/server/interface.cpp
+index a72c656..0155b6d 100644
+--- a/src/server/interface.cpp
++++ b/src/server/interface.cpp
+@@ -17,13 +17,8 @@ interface::interface(sdbusplus::bus::bus& bus, const char* path,
+     _interface_added(false)
+ {
+     sd_bus_slot* slot = nullptr;
+-    int r = _intf->sd_bus_add_object_vtable(_bus.get(), &slot, _path.c_str(),
+-                                            _interf.c_str(), vtable, context);
+-    if (r < 0)
+-    {
+-        throw exception::SdBusError(-r, "sd_bus_add_object_vtable");
+-    }
+-
++    _intf->sd_bus_add_object_vtable(_bus.get(), &slot, _path.c_str(),
++                                    _interf.c_str(), vtable, context);
+     _slot = decltype(_slot){slot};
+ }
  
-         _slot = decltype(_slot){slot};
-     }
 -- 
-2.26.2
+2.17.1