Commit f930713b authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

Pull libata fixlet from Tejun Heo:
 "Speed limiting fix for sata_fsl"

* 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  sata-fsl: Apply link speed limits
parents b695f31f 29200f12
...@@ -869,6 +869,8 @@ static int sata_fsl_hardreset(struct ata_link *link, unsigned int *class, ...@@ -869,6 +869,8 @@ static int sata_fsl_hardreset(struct ata_link *link, unsigned int *class,
*/ */
ata_msleep(ap, 1); ata_msleep(ap, 1);
sata_set_spd(link);
/* /*
* Now, bring the host controller online again, this can take time * Now, bring the host controller online again, this can take time
* as PHY reset and communication establishment, 1st D2H FIS and * as PHY reset and communication establishment, 1st D2H FIS and
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment