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 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[pandora-kernel.git]
/
drivers
/
block
/
drbd
/
drbd_nl.c
diff --git
a/drivers/block/drbd/drbd_nl.c
b/drivers/block/drbd/drbd_nl.c
index
259ca0b
..
515bcd9
100644
(file)
--- a/
drivers/block/drbd/drbd_nl.c
+++ b/
drivers/block/drbd/drbd_nl.c
@@
-1342,7
+1342,7
@@
static int drbd_nl_detach(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
ret = wait_event_interruptible(mdev->misc_wait,
mdev->state.disk != D_FAILED);
drbd_resume_io(mdev);
- if (
retcode ==
SS_IS_DISKLESS)
+ if (
(int)retcode == (int)
SS_IS_DISKLESS)
retcode = SS_NOTHING_TO_DO;
if (ret)
retcode = ERR_INTR;