summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2018-09-12 03:18:44 +0300
committerMichael Ellerman <mpe@ellerman.id.au>2018-10-08 14:53:10 +0300
commitb52dce87389385aad54f5680329b41257ee0f7ac (patch)
treeec8c722b4e2a581cb83f1105464a5a83746e6ca1 /drivers
parent2341629eadc4a40aa46103c7f1ff5f38459688d3 (diff)
downloadlinux-b52dce87389385aad54f5680329b41257ee0f7ac.tar.xz
macintosh/via-macii: Synchronous bus reset
Make the reset operation synchronous, like the other ADB drivers. The reset request is static data but callers may not know that. This way the struct is not in use when the reset method returns. Tested-by: Stan Johnson <userm57@yahoo.com> Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/macintosh/via-macii.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c
index cf6f7d52d6be..36a4f49e79b5 100644
--- a/drivers/macintosh/via-macii.c
+++ b/drivers/macintosh/via-macii.c
@@ -331,7 +331,8 @@ static int macii_reset_bus(void)
return 0;
/* Command = 0, Address = ignored */
- adb_request(&req, NULL, 0, 1, ADB_BUSRESET);
+ adb_request(&req, NULL, ADBREQ_NOSEND, 1, ADB_BUSRESET);
+ macii_send_request(&req, 1);
/* Don't want any more requests during the Global Reset low time. */
udelay(3000);