diff --git a/[refs] b/[refs] index 90a1fa511333..60ce2f1cfdac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e90285e0ba11c1a4a09b8a50d8d5b18e1298d245 +refs/heads/master: c0d42c8e5724e470873fa7491200c083600f5787 diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index 2dfbcfa1a7b2..52378ccda745 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -1703,7 +1703,7 @@ int drbd_send(struct drbd_tconn *tconn, struct socket *sock, int rv, sent = 0; if (!sock) - return -1000; + return -EBADR; /* THINK if (signal_pending) return ... ? */