summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aacraid/src.c
diff options
context:
space:
mode:
authorIngo Molnar2017-10-14 10:11:45 +0200
committerIngo Molnar2017-10-14 10:11:45 +0200
commit6edcf57233108df2e50ab5d3fa695ea958b4c779 (patch)
tree7f233132de3cf1d438ac5ca51cfa6e9c48f8b86f /drivers/scsi/aacraid/src.c
parentx86/unwinder: Make CONFIG_UNWINDER_ORC=y the default in the 64-bit defconfig (diff)
parentobjtool: Upgrade libelf-devel warning to error for CONFIG_ORC_UNWINDER (diff)
downloadkernel-qcow2-linux-6edcf57233108df2e50ab5d3fa695ea958b4c779.tar.gz
kernel-qcow2-linux-6edcf57233108df2e50ab5d3fa695ea958b4c779.tar.xz
kernel-qcow2-linux-6edcf57233108df2e50ab5d3fa695ea958b4c779.zip
Merge branch 'core/urgent' into x86/asm, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/scsi/aacraid/src.c')
-rw-r--r--drivers/scsi/aacraid/src.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c
index 48c2b2b34b72..0c9361c87ec8 100644
--- a/drivers/scsi/aacraid/src.c
+++ b/drivers/scsi/aacraid/src.c
@@ -740,6 +740,8 @@ static void aac_send_iop_reset(struct aac_dev *dev)
aac_set_intx_mode(dev);
src_writel(dev, MUnit.IDR, IOP_SRC_RESET_MASK);
+
+ msleep(5000);
}
static void aac_send_hardware_soft_reset(struct aac_dev *dev)