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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 CE643C31E4B for ; Fri, 14 Jun 2019 20:38:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7F2321473 for ; Fri, 14 Jun 2019 20:38:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544734; bh=6BVu7bzRZMrsY8cN3BN2v7SQDyHq/7qlDh9aorjpeaA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ruP1Q/mudDvIKU7Mprny0Euv2/wYgylIpqQJAFw463XTtoJeT04qQMZz2oJVyxjAC 0IYhVXvMJDpwDETbDakE0EdjFeReiQHQDYXywodh4FByJbAYaoGqWQ/ANJwUcb8kYi 4Hmn7XQc22gwg+pzMMf7w3oH6ubROE3suZHvyRzw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728382AbfFNUis (ORCPT ); Fri, 14 Jun 2019 16:38:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:50744 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726637AbfFNU3A (ORCPT ); Fri, 14 Jun 2019 16:29:00 -0400 Received: from sasha-vm.mshome.net (unknown [131.107.159.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 936222186A; Fri, 14 Jun 2019 20:28:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544139; bh=6BVu7bzRZMrsY8cN3BN2v7SQDyHq/7qlDh9aorjpeaA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E+y5V9i5WqXOqxR+WSvWNw3HoAyso9XLO96nZ3mt/XWRWMP2Ujh/rxqFUx0uSifzP mErsImUWUq1woEa9HSTduCirQWRH6wgPu/ZTr2Ym4OMkqIffEJMCn0x3/dYZk2myu6 Mney8H36tpjSFz9+oqkzEbe9x14wMOjg5etyZ1yo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chengguang Xu , Wu Hao , Alan Tull , Greg Kroah-Hartman , Sasha Levin , linux-fpga@vger.kernel.org Subject: [PATCH AUTOSEL 5.1 17/59] fpga: dfl: expand minor range when registering chrdev region Date: Fri, 14 Jun 2019 16:28:01 -0400 Message-Id: <20190614202843.26941-17-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190614202843.26941-1-sashal@kernel.org> References: <20190614202843.26941-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chengguang Xu [ Upstream commit de9a7f6f5f1967d275311cca9163b4a3ffe9b0ae ] Actually, total amount of available minor number for a single major is MINORMASK + 1. So expand minor range when registering chrdev region. Signed-off-by: Chengguang Xu Acked-by: Wu Hao Acked-by: Alan Tull Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/fpga/dfl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c index c25217cde5ca..4b66aaa32b5a 100644 --- a/drivers/fpga/dfl.c +++ b/drivers/fpga/dfl.c @@ -322,7 +322,7 @@ static void dfl_chardev_uinit(void) for (i = 0; i < DFL_FPGA_DEVT_MAX; i++) if (MAJOR(dfl_chrdevs[i].devt)) { unregister_chrdev_region(dfl_chrdevs[i].devt, - MINORMASK); + MINORMASK + 1); dfl_chrdevs[i].devt = MKDEV(0, 0); } } @@ -332,8 +332,8 @@ static int dfl_chardev_init(void) int i, ret; for (i = 0; i < DFL_FPGA_DEVT_MAX; i++) { - ret = alloc_chrdev_region(&dfl_chrdevs[i].devt, 0, MINORMASK, - dfl_chrdevs[i].name); + ret = alloc_chrdev_region(&dfl_chrdevs[i].devt, 0, + MINORMASK + 1, dfl_chrdevs[i].name); if (ret) goto exit; } -- 2.20.1