From patchwork Mon May 1 16:03:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?RGF2aWQgSMODwqRyZGVtYW4=?= X-Patchwork-Id: 9706669 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6BF72602B5 for ; Mon, 1 May 2017 16:03:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C34828066 for ; Mon, 1 May 2017 16:03:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 511B62808F; Mon, 1 May 2017 16:03:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 044C628066 for ; Mon, 1 May 2017 16:03:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758673AbdEAQDx (ORCPT ); Mon, 1 May 2017 12:03:53 -0400 Received: from vader.hardeman.nu ([95.142.160.32]:41252 "EHLO hardeman.nu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757788AbdEAQDx (ORCPT ); Mon, 1 May 2017 12:03:53 -0400 Received: from hardeman.nu (zeus.hardeman.nu [IPv6:fd27:2a41:8fcb:2::a]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by vader.hardeman.nu (Postfix) with ESMTPSA id ADBEA436B; Mon, 1 May 2017 18:03:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=hardeman.nu; s=hardeman-201704; t=1493654631; bh=c8llmKdMg8lDhBYSMdoIR4bh5Y4YFCZM/FuI+b7J0Jc=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=P7E/CQoxv8m2h+sNKxumgewm4TGx7zVKSKyhp2URWsyQYBkxFRrQ8rU48apJV/HFE /BOWGNn9CUJGceyL0A6OOS5To4jco2q/y4VsAcIu2D0NoiHh/4x5KdpnnBUficZmvU oBfLZzAzsJl+N8LnFPQDKBGWgYtbskE6c98FDfNyPISPz41FCjahgcnKXGEo+LI34I THFSt7CWMj+KPFWx9O4qGiaQClhXNXZxjoQyUjAgaP86ibmFQ5b6UFcYu4Xn+EFiGC kMSz8zb9MNpC38/iIjvvHXbefsnAY4LtTuBDsRjpViL+CNBl0pWRLfAWsdpOFI56Nr cqTsxR4yZJ9yw== Received: (nullmailer pid 13279 invoked by uid 1000); Mon, 01 May 2017 16:03:51 -0000 Subject: [PATCH 03/16] lirc_dev: correct error handling From: David =?utf-8?b?SMOkcmRlbWFu?= To: linux-media@vger.kernel.org Cc: mchehab@s-opensource.com, sean@mess.org Date: Mon, 01 May 2017 18:03:51 +0200 Message-ID: <149365463117.12922.15518669536847504845.stgit@zeus.hardeman.nu> In-Reply-To: <149365439677.12922.11872546284425440362.stgit@zeus.hardeman.nu> References: <149365439677.12922.11872546284425440362.stgit@zeus.hardeman.nu> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If an error is generated, nonseekable_open() shouldn't be called. Signed-off-by: David Härdeman --- drivers/media/rc/lirc_dev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c index 05f600bd6c67..7f13ed479e1c 100644 --- a/drivers/media/rc/lirc_dev.c +++ b/drivers/media/rc/lirc_dev.c @@ -431,7 +431,7 @@ EXPORT_SYMBOL(lirc_unregister_driver); int lirc_dev_fop_open(struct inode *inode, struct file *file) { struct irctl *ir; - int retval = 0; + int retval; if (iminor(inode) >= MAX_IRCTL_DEVICES) { pr_err("open result for %d is -ENODEV\n", iminor(inode)); @@ -475,9 +475,11 @@ int lirc_dev_fop_open(struct inode *inode, struct file *file) ir->open++; -error: nonseekable_open(inode, file); + return 0; + +error: return retval; } EXPORT_SYMBOL(lirc_dev_fop_open);