From patchwork Wed Dec 23 17:51:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 7913381 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B12289F350 for ; Wed, 23 Dec 2015 17:52:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EBB9E204D2 for ; Wed, 23 Dec 2015 17:52:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9EC782049E for ; Wed, 23 Dec 2015 17:52:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933738AbbLWRv6 (ORCPT ); Wed, 23 Dec 2015 12:51:58 -0500 Received: from bombadil.infradead.org ([198.137.202.9]:46234 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933376AbbLWRv5 (ORCPT ); Wed, 23 Dec 2015 12:51:57 -0500 Received: from 179.186.96.36.dynamic.adsl.gvt.net.br ([179.186.96.36] helo=smtp.w2.samsung.com) by bombadil.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1aBnZs-0006L6-4T; Wed, 23 Dec 2015 17:51:56 +0000 Received: from mchehab by smtp.w2.samsung.com with local (Exim 4.86) (envelope-from ) id 1aBnZP-00086k-Q7; Wed, 23 Dec 2015 15:51:27 -0200 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Linux Media Mailing List , Mauro Carvalho Chehab , Krzysztof Kozlowski , Lee Jones , Arnd Bergmann Subject: [PATCH] [media] timblogiw: protect desc Date: Wed, 23 Dec 2015 15:51:26 -0200 Message-Id: X-Mailer: git-send-email 2.5.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As sparse complains: drivers/media/platform/timblogiw.c:562:22: warning: context imbalance in 'buffer_queue' - unexpected unlock there's something weird at the logic there. The semaphore seems to be protecting changes at the desc struct, however, the callback logic is not protected. Compile-tested only. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/timblogiw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/timblogiw.c b/drivers/media/platform/timblogiw.c index 113c9f3c0b3e..a5d2607cc396 100644 --- a/drivers/media/platform/timblogiw.c +++ b/drivers/media/platform/timblogiw.c @@ -566,8 +566,8 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb) desc = dmaengine_prep_slave_sg(fh->chan, buf->sg, sg_elems, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT); + spin_lock_irq(&fh->queue_lock); if (!desc) { - spin_lock_irq(&fh->queue_lock); list_del_init(&vb->queue); vb->state = VIDEOBUF_PREPARED; return; @@ -576,8 +576,8 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb) desc->callback_param = buf; desc->callback = timblogiw_dma_cb; + spin_unlock_irq(&fh->queue_lock); buf->cookie = desc->tx_submit(desc); - spin_lock_irq(&fh->queue_lock); }