From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68573C742BB for ; Fri, 12 Jul 2019 12:37:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3487E21670 for ; Fri, 12 Jul 2019 12:37:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562935050; bh=QaG2Xvm2G6eZQNV9BGAb4s4cN88lVMswx2BQRGp8/4s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=i1bG9yHd5rK+84XTVtDleETe0Qx2DlvF6/ZzoPGuv0TAy7T1xkQBPrUnEb8pGrMPJ MlzP/LOaD6EkILijKBQtR6cDCdF0xrM/502VB9DjlpvkXufZpHz+6GSE39bKQ3ugYq 89hhfPHAsNHqCTUWruo1tNjNGCLOnBlSCmSJgp7c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728937AbfGLMbF (ORCPT ); Fri, 12 Jul 2019 08:31:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:47404 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728925AbfGLMbF (ORCPT ); Fri, 12 Jul 2019 08:31:05 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B9D462166E; Fri, 12 Jul 2019 12:31:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934664; bh=QaG2Xvm2G6eZQNV9BGAb4s4cN88lVMswx2BQRGp8/4s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cg8l/ihB4uvyMjnjbcAS5YR0YxljtvnSucUglvC2Ert+23r9LjYAum9bQg2S3Ud33 lfuYZstRUcK4gWw036kIWQGpZB2rhHqykLxhS0LPbyb/BBNYHlKiQS6VEFKfpeub2C Khs7A707tvvSIarlghL5PcS4jhv5G+5FG32wNYiI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicolas Saenz Julienne , Stefan Wahren Subject: [PATCH 5.1 130/138] staging: vchiq_2835_arm: revert "quit using custom down_interruptible()" Date: Fri, 12 Jul 2019 14:19:54 +0200 Message-Id: <20190712121633.711116469@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190712121628.731888964@linuxfoundation.org> References: <20190712121628.731888964@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nicolas Saenz Julienne commit 061ca1401f96c254e7f179bf97a1fc5c7f47e1e1 upstream. The killable version of down() is meant to be used on situations where it should not fail at all costs, but still have the convenience of being able to kill it if really necessary. VCHIQ doesn't fit this criteria, as it's mainly used as an interface to V4L2 and ALSA devices. Fixes: ff5979ad8636 ("staging: vchiq_2835_arm: quit using custom down_interruptible()") Signed-off-by: Nicolas Saenz Julienne Acked-by: Stefan Wahren Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c @@ -553,7 +553,7 @@ create_pagelist(char __user *buf, size_t (g_cache_line_size - 1)))) { char *fragments; - if (down_killable(&g_free_fragments_sema)) { + if (down_interruptible(&g_free_fragments_sema) != 0) { cleanup_pagelistinfo(pagelistinfo); return NULL; }