Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py

index f4bf159bb5..8d630c6b1a 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -29,7 +29,7 @@ class DeviceHandler(BaseHandler):
 
     @defer.inlineCallbacks
     def check_device_registered(self, user_id, device_id,
-                                initial_device_display_name):
+                                initial_device_display_name=None):
         """
         If the given device has not been registered, register it with the
         supplied display name.