git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'i2c-fixes' of git://git.fluff.org/bjdooks/linux
[sfrench/cifs-2.6.git]
/
drivers
/
ide
/
ide-eh.c
diff --git
a/drivers/ide/ide-eh.c
b/drivers/ide/ide-eh.c
index 2b91419796136e24b4a98a27dd85aab0c6caccc0..e9abf2c3c33544c047ec2db7f29f1f295da0a397 100644
(file)
--- a/
drivers/ide/ide-eh.c
+++ b/
drivers/ide/ide-eh.c
@@
-149,7
+149,7
@@
static inline void ide_complete_drive_reset(ide_drive_t *drive, int err)
if (rq && blk_special_request(rq) && rq->cmd[0] == REQ_DRIVE_RESET) {
if (err <= 0 && rq->errors == 0)
rq->errors = -EIO;
- ide_complete_rq(drive, err ? err : 0,
ide
_rq_bytes(rq));
+ ide_complete_rq(drive, err ? err : 0,
blk
_rq_bytes(rq));
}
}