From 486768923c76ebb9b93222c1b9a1316e9bbea853 Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Sun, 17 Feb 2008 11:24:51 -0600 Subject: [PATCH] --- yaml --- r: 86181 b: refs/heads/master c: ff83efacf2b77a1fe8942db6613825a4b80ee5e2 h: refs/heads/master i: 86179: ea99072c13c577295cf0f3fa8a3caf7d0982f6bc v: v3 --- [refs] | 2 +- trunk/drivers/scsi/gdth_proc.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index eba6b1305923..702b4730ae64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 279e7f5425c5e6da6ca61b1d8576356a939789f9 +refs/heads/master: ff83efacf2b77a1fe8942db6613825a4b80ee5e2 diff --git a/trunk/drivers/scsi/gdth_proc.c b/trunk/drivers/scsi/gdth_proc.c index de5773443c62..ce0228e26aec 100644 --- a/trunk/drivers/scsi/gdth_proc.c +++ b/trunk/drivers/scsi/gdth_proc.c @@ -694,15 +694,13 @@ static void gdth_ioctl_free(gdth_ha_str *ha, int size, char *buf, ulong64 paddr) { ulong flags; - spin_lock_irqsave(&ha->smp_lock, flags); - if (buf == ha->pscratch) { + spin_lock_irqsave(&ha->smp_lock, flags); ha->scratch_busy = FALSE; + spin_unlock_irqrestore(&ha->smp_lock, flags); } else { pci_free_consistent(ha->pdev, size, buf, paddr); } - - spin_unlock_irqrestore(&ha->smp_lock, flags); } #ifdef GDTH_IOCTL_PROC