From 4f9cf6c234484ee27bec2bea2f377eb5e9a27fc8 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 6 Feb 2024 15:56:49 -0600
Subject: [PATCH] make sure its set right away when adding the device

---
 .../components/dlna_dmr/media_player.py       | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/homeassistant/components/dlna_dmr/media_player.py b/homeassistant/components/dlna_dmr/media_player.py
index 6001b8e8bf0..99e615ee2be 100644
--- a/homeassistant/components/dlna_dmr/media_player.py
+++ b/homeassistant/components/dlna_dmr/media_player.py
@@ -376,13 +376,9 @@ class DlnaDmrEntity(MediaPlayerEntity):
         if not self._device:
             return  # Can't get all the required information without a connection
 
-        if not self.registry_entry or not self.registry_entry.config_entry_id:
-            return  # No config registry entry to link to
-
-        if self.registry_entry.device_id and not set_mac and self._updated_registry:
+        if not set_mac and self._updated_registry:
             return  # No new information
 
-        self._updated_registry = True
         # Connections based on the root device's UDN, and the DMR embedded
         # device's UDN. They may be the same, if the DMR is the root device.
         connections = {
@@ -404,6 +400,18 @@ class DlnaDmrEntity(MediaPlayerEntity):
                 (dr.CONNECTION_NETWORK_MAC, self.mac_address)
             )
 
+        self._attr_device_info = dr.DeviceInfo(
+            connections=connections,
+            default_manufacturer=self._device.manufacturer,
+            default_model=self._device.model_name,
+            default_name=self._device.name,
+        )
+
+        if not self.registry_entry or not self.registry_entry.config_entry_id:
+            # No config registry entry to update
+            return
+
+        self._updated_registry = True
         # Create linked HA DeviceEntry now the information is known.
         dev_reg = dr.async_get(self.hass)
         device_entry = dev_reg.async_get_or_create(
@@ -423,13 +431,6 @@ class DlnaDmrEntity(MediaPlayerEntity):
             device_id=device_entry.id,
         )
 
-        self._attr_device_info = dr.DeviceInfo(
-            connections=connections,
-            default_manufacturer=self._device.manufacturer,
-            default_model=self._device.model_name,
-            default_name=self._device.name,
-        )
-
     async def _device_disconnect(self) -> None:
         """Destroy connections to the device now that it's not available.