Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Hunk #1 FAILED at 2805.
- Hunk #2 succeeded at 2977 with fuzz 1 (offset 157 lines).
- 1 out of 2 hunks FAILED -- saving rejects to file libata-eh.c.rej
- /home/meowismus/linux/lugs/linux-3.7/drivers/ata/libata-eh.c.rej 481/481 100%
- --- libata-eh.c
- +++ libata-eh.c
- @@ -2805,7 +2805,14 @@
- sata_scr_read(link, SCR_STATUS, &sstatus))
- rc = -ERESTART;
- - if (rc == -ERESTART || try >= max_tries)
- + if (try >= max_tries)
- + goto out;
- +
- + /* Some PMP will not serve SRST until the disk is spunup,
- + * if the controller can not wait for the PMP to acknowledge the frame,
- + * wait here */
- + if (rc == -ERESTART &&
- + !((lflags & ATA_LFLAG_WAIT_SRST) && (reset == softreset)))
- goto out;
- now = jiffies;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement