Merge tag 'mac80211-for-john-2014-11-18' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / block / drbd / drbd_req.c

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index c67717d..5a01c53 100644 (file)
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -1645,6 +1645,6 @@ void request_timer_fn(unsigned long data)
                ? oldest_submit_jif + dt : now + et;
        nt = time_before(ent, dt) ? ent : dt;
 out:
-       spin_unlock_irq(&connection->resource->req_lock);
+       spin_unlock_irq(&device->resource->req_lock);
        mod_timer(&device->request_timer, nt);
 }