git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
s390
/
block
/
dasd.c
diff --git
a/drivers/s390/block/dasd.c
b/drivers/s390/block/dasd.c
index
bbea90b
..
acf222f
100644
(file)
--- a/
drivers/s390/block/dasd.c
+++ b/
drivers/s390/block/dasd.c
@@
-1899,7
+1899,8
@@
restart:
/* Process requests that may be recovered */
if (cqr->status == DASD_CQR_NEED_ERP) {
erp_fn = base->discipline->erp_action(cqr);
- erp_fn(cqr);
+ if (IS_ERR(erp_fn(cqr)))
+ continue;
goto restart;
}