Advertisement
Guest User

hunks failed?

a guest
Dec 14th, 2012
42
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.01 KB | None | 0 0
  1. Hunk #1 FAILED at 2805.
  2. Hunk #2 succeeded at 2977 with fuzz 1 (offset 157 lines).
  3. 1 out of 2 hunks FAILED -- saving rejects to file libata-eh.c.rej
  4.  
  5. /home/meowismus/linux/lugs/linux-3.7/drivers/ata/libata-eh.c.rej 481/481 100%
  6. --- libata-eh.c
  7. +++ libata-eh.c
  8.  
  9.  
  10. @@ -2805,7 +2805,14 @@
  11. sata_scr_read(link, SCR_STATUS, &sstatus))
  12. rc = -ERESTART;
  13.  
  14. - if (rc == -ERESTART || try >= max_tries)
  15. + if (try >= max_tries)
  16. + goto out;
  17. +
  18. + /* Some PMP will not serve SRST until the disk is spunup,
  19. + * if the controller can not wait for the PMP to acknowledge the frame,
  20. + * wait here */
  21. + if (rc == -ERESTART &&
  22. + !((lflags & ATA_LFLAG_WAIT_SRST) && (reset == softreset)))
  23. goto out;
  24.  
  25. now = jiffies;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement