1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c
index fcdb6b0dc40..64dfb1f6823 100644
--- a/drivers/net/wireless/rt2x00/rt2x00debug.c
+++ b/drivers/net/wireless/rt2x00/rt2x00debug.c
@@ -162,11 +162,11 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
         struct timeval timestamp;
         u32 data_len;
 
-        do_gettimeofday(&timestamp);
-
-        if (!test_bit(FRAME_DUMP_FILE_OPEN, &intf->frame_dump_flags))
+        if (likely(!test_bit(FRAME_DUMP_FILE_OPEN, &intf->frame_dump_flags)))
                 return;
 
+        do_gettimeofday(&timestamp);
+
         if (skb_queue_len(&intf->frame_dump_skbqueue) > 20) {
                 DEBUG(rt2x00dev, "txrx dump queue length exceeded.\n");
                 return;
@@ -342,7 +342,7 @@ static ssize_t rt2x00debug_read_queue_stats(struct file *file,
             sprintf(data, "qid\tcount\tlimit\tlength\tindex\tdma done\tdone\n");
 
         queue_for_each(intf->rt2x00dev, queue) {
-                spin_lock_irqsave(&queue->lock, irqflags);
+                spin_lock_irqsave(&queue->index_lock, irqflags);
 
                 temp += sprintf(temp, "%d\t%d\t%d\t%d\t%d\t%d\t%d\n", queue->qid,
                                 queue->count, queue->limit, queue->length,
@@ -350,7 +350,7 @@ static ssize_t rt2x00debug_read_queue_stats(struct file *file,
                                 queue->index[Q_INDEX_DMA_DONE],
                                 queue->index[Q_INDEX_DONE]);
 
-                spin_unlock_irqrestore(&queue->lock, irqflags);
+                spin_unlock_irqrestore(&queue->index_lock, irqflags);
         }
 
         size = strlen(data);