From ad4a332508c4c59426d5ada522c9932ad5a67457 Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Mon, 13 Jun 2011 20:55:06 -0700 Subject: [PATCH] --- yaml --- r: 256892 b: refs/heads/master c: 56e34ee2adb59a35bfa5714bdf4dcb3f4d14a41d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/target/target_core_device.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9c96c8584ae0..a50f93fddeee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78faae37897dc2a9ccc7c19155294a4bfdcae077 +refs/heads/master: 56e34ee2adb59a35bfa5714bdf4dcb3f4d14a41d diff --git a/trunk/drivers/target/target_core_device.c b/trunk/drivers/target/target_core_device.c index e25df3b813e5..6d93d9684cfc 100644 --- a/trunk/drivers/target/target_core_device.c +++ b/trunk/drivers/target/target_core_device.c @@ -813,12 +813,13 @@ static void se_dev_stop(struct se_device *dev) int se_dev_check_online(struct se_device *dev) { + unsigned long flags; int ret; - spin_lock_irq(&dev->dev_status_lock); + spin_lock_irqsave(&dev->dev_status_lock, flags); ret = ((dev->dev_status & TRANSPORT_DEVICE_ACTIVATED) || (dev->dev_status & TRANSPORT_DEVICE_DEACTIVATED)) ? 0 : 1; - spin_unlock_irq(&dev->dev_status_lock); + spin_unlock_irqrestore(&dev->dev_status_lock, flags); return ret; }