projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
sata_inic162x.c
diff --git
a/drivers/ata/sata_inic162x.c
b/drivers/ata/sata_inic162x.c
index a36149ebf4a2c835717ab820915a4f76af0201ee..83a44471b1897b7d93acb7220ce0ac71a492c28b 100644
(file)
--- a/
drivers/ata/sata_inic162x.c
+++ b/
drivers/ata/sata_inic162x.c
@@
-614,7
+614,7
@@
static int inic_hardreset(struct ata_link *link, unsigned int *class,
writew(IDMA_CTL_RST_ATA, idma_ctl);
readw(idma_ctl); /* flush */
-
msleep(
1);
+
ata_msleep(ap,
1);
writew(0, idma_ctl);
rc = sata_link_resume(link, timing, deadline);