ctlmgr: fix the fix (107e2fe)

jordens · jordens · commit 17ac64a65edd · 2016-01-29T17:52:12.000-07:00
diff --git a/artiq/devices/ctlmgr.py b/artiq/devices/ctlmgr.py
@@ -41,14 +41,14 @@ async def call(self, method, *args, **kwargs):
         try:
             targets, _ = remote.get_rpc_id()
             remote.select_rpc_target(targets[0])
-            r = await getattr(remote, method)()
+            r = await getattr(remote, method)(*args, **kwargs)
         finally:
             remote.close_rpc()
         return r
 
     async def _ping(self):
         try:
-            ok = await asyncio.wait_for(self._call_controller("ping"),
+            ok = await asyncio.wait_for(self.call("ping"),
                                         self.ping_timeout)
             if ok:
                 self.retry_timer_cur = self.retry_timer
