From f3a9622ef9456626425be811b408b749752f1897 Mon Sep 17 00:00:00 2001 From: Asai Thambi S P Date: Tue, 29 May 2012 18:43:16 -0700 Subject: [PATCH] --- yaml --- r: 309613 b: refs/heads/master c: 0a07ab224afc56c497e2f1c48e853dbdf964d549 h: refs/heads/master i: 309611: bea24159fd58f8f1ff00ccde8690337928be85cf v: v3 --- [refs] | 2 +- trunk/drivers/block/mtip32xx/mtip32xx.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ef5e936b8387..857a70aa33d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c8ab69818e9469c864eea7d47c3d1c36ecd1e95 +refs/heads/master: 0a07ab224afc56c497e2f1c48e853dbdf964d549 diff --git a/trunk/drivers/block/mtip32xx/mtip32xx.c b/trunk/drivers/block/mtip32xx/mtip32xx.c index 07cc07febbe1..bfee50d1b319 100644 --- a/trunk/drivers/block/mtip32xx/mtip32xx.c +++ b/trunk/drivers/block/mtip32xx/mtip32xx.c @@ -294,18 +294,16 @@ static int hba_reset_nosleep(struct driver_data *dd) */ static inline void mtip_issue_ncq_command(struct mtip_port *port, int tag) { - unsigned long flags = 0; - atomic_set(&port->commands[tag].active, 1); - spin_lock_irqsave(&port->cmd_issue_lock, flags); + spin_lock(&port->cmd_issue_lock); writel((1 << MTIP_TAG_BIT(tag)), port->s_active[MTIP_TAG_INDEX(tag)]); writel((1 << MTIP_TAG_BIT(tag)), port->cmd_issue[MTIP_TAG_INDEX(tag)]); - spin_unlock_irqrestore(&port->cmd_issue_lock, flags); + spin_unlock(&port->cmd_issue_lock); /* Set the command's timeout value.*/ port->commands[tag].comp_time = jiffies + msecs_to_jiffies(