← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to drivers/media/video/v4l2-mem2mem.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/media/video/v4l2-mem2mem.c
97
97
 
98
98
        spin_lock_irqsave(&q_ctx->rdy_spinlock, flags);
99
99
 
100
 
        if (list_empty(&q_ctx->rdy_queue))
101
 
                goto end;
 
100
        if (list_empty(&q_ctx->rdy_queue)) {
 
101
                spin_unlock_irqrestore(&q_ctx->rdy_spinlock, flags);
 
102
                return NULL;
 
103
        }
102
104
 
103
105
        b = list_entry(q_ctx->rdy_queue.next, struct v4l2_m2m_buffer, list);
104
 
end:
105
106
        spin_unlock_irqrestore(&q_ctx->rdy_spinlock, flags);
106
107
        return &b->vb;
107
108
}
117
118
        unsigned long flags;
118
119
 
119
120
        spin_lock_irqsave(&q_ctx->rdy_spinlock, flags);
120
 
        if (!list_empty(&q_ctx->rdy_queue)) {
121
 
                b = list_entry(q_ctx->rdy_queue.next, struct v4l2_m2m_buffer,
122
 
                                list);
123
 
                list_del(&b->list);
124
 
                q_ctx->num_rdy--;
 
121
        if (list_empty(&q_ctx->rdy_queue)) {
 
122
                spin_unlock_irqrestore(&q_ctx->rdy_spinlock, flags);
 
123
                return NULL;
125
124
        }
 
125
        b = list_entry(q_ctx->rdy_queue.next, struct v4l2_m2m_buffer, list);
 
126
        list_del(&b->list);
 
127
        q_ctx->num_rdy--;
126
128
        spin_unlock_irqrestore(&q_ctx->rdy_spinlock, flags);
127
129
 
128
130
        return &b->vb;