From patchwork Wed Jan 4 12:42:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 9496645 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 35D98606B5 for ; Wed, 4 Jan 2017 12:42:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 26FDE27F7F for ; Wed, 4 Jan 2017 12:42:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1BC4B27F89; Wed, 4 Jan 2017 12:42: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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8B27427F7F for ; Wed, 4 Jan 2017 12:42:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EDDDC6E23E; Wed, 4 Jan 2017 12:42:46 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by gabe.freedesktop.org (Postfix) with ESMTPS id C2A146E23E for ; Wed, 4 Jan 2017 12:42:44 +0000 (UTC) Received: from epcas5p2.samsung.com (unknown [182.195.41.40]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OJ900KQ89Z5KP40@mailout3.samsung.com> for dri-devel@lists.freedesktop.org; Wed, 04 Jan 2017 21:42:41 +0900 (KST) Received: from epsmges5p3.samsung.com (unknown [182.195.42.46]) by epcas5p1.samsung.com (KnoxPortal) with ESMTP id 20170104124241epcas5p1bdd945b9beb3aa996bea5700321f76d7~WkhiBBjyo2515225152epcas5p1h; Wed, 4 Jan 2017 12:42:41 +0000 (GMT) Received: from epcas5p1.samsung.com ( [182.195.41.39]) by epsmges5p3.samsung.com (EPCPMTA) with SMTP id F4.78.27486.1CDEC685; Wed, 4 Jan 2017 21:42:41 +0900 (KST) Received: from epcpsbgm2new.samsung.com (u27.gpu120.samsung.co.kr [203.254.230.27]) by epcas5p4.samsung.com (KnoxPortal) with ESMTP id 20170104124240epcas5p4e9c51bb5dc001506a5b7923dc1ef7623~WkhhgaShX2895928959epcas5p4X; Wed, 4 Jan 2017 12:42:40 +0000 (GMT) X-AuditID: b6c32a2e-f79b36d000006b5e-20-586cedc1b290 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id 05.6A.28332.0CDEC685; Wed, 4 Jan 2017 21:42:40 +0900 (KST) Received: from amdc3058.localnet ([106.120.53.102]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OJ9008NC9Z3IT90@mmp1.samsung.com>; Wed, 04 Jan 2017 21:42:40 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: Linus Torvalds Subject: [GIT PULL] fbdev fixes for v4.10-rc2 Date: Wed, 04 Jan 2017 13:42:38 +0100 Message-id: <6009223.Ou6P7G7uWh@amdc3058> User-Agent: KMail/4.13.3 (Linux/3.13.0-96-generic; KDE/4.13.3; x86_64; ; ) MIME-version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFIsWRmVeSWpSXmKPExsWy7bCmuu7BtzkRBn1nuCyufH3PZnGi7wOr xeVdc9gsHvW9ZXdg8Tgx4zeLx/3u40wenzfJBTBHcdmkpOZklqUW6dslcGV8PHeXuaBduGLx 3q+sDYy/+bsYOTkkBEwkVl27yQZhi0lcuLceyObiEBJYyijx/2E3I4TTziRx70ovcxcjB1jH h9/1EPHljBIf115jhXC+Mkr83DKXCWQUm4CVxMT2VYwgtoiAkcTnF1dYQWxmgQSJ/+d3gtUI C+hK9C3rAKthEVCVuH3qFpjNK6ApcXfpWbCTRAW8JLbsa2eCiAtK/Jh8jwVijrzEvv1ToWbq SJw9tg7sUgmB52wShyetYIW4VFZi0wGoo10kPi+VgPhSWOLV8S3sELa0xN+lEGslBKYzSmz/ LQExZjOjxKrdE6CKrCUOH78ItYtPovf3EyaImbwSHW1CEKaHxMrbghDVjhLda9vZQcJCArES 3xeYTWCUm4Xk/llI7p+F5P4FjMyrGMVSC4pz01OLTQuM9YoTc4tL89L1kvNzNzGCU4CW3g7G fwu8DzEKcDAq8fDeOJMdIcSaWFZcmXuIUYKDWUmE99uLnAgh3pTEyqrUovz4otKc1OJDjNIc LErivAsqrCOEBNITS1KzU1MLUotgskwcnFINjDHrtk/7zmO76Vab47HpP3Ne+n9h2nz3X97a fX1x7z0dmyWO9FUE9sw6yT9Pc5HeF77EHbfVGW3FzXaxip+7xbTnx1cxiSdxgY8Fg6Zrf/p2 6lgXf6SvVMXha6bPlvhvCT6+QExPuPkWH1/H6i/rQ+2ajtY/6V5ptEio+IzI2hX7hbcWzXJ4 sUiJpTgj0VCLuag4EQAsn60h/QIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmkeLIzCtJLcpLzFFi42I5/e+xgO6BtzkRBhv2qllc+fqezeJE3wdW i8u75rBZPOp7y+7A4nFixm8Wj/vdx5k8Pm+SC2COcrPJSE1MSS1SSM1Lzk/JzEu3VQoNcdO1 UFLIS8xNtVWK0PUNCVJSKEvMKQXyjAzQgINzgHuwkr5dglvGx3N3mQvahSsW7/3K2sD4m7+L kYNDQsBE4sPv+i5GTiBTTOLCvfVsXYxcHEICSxkldq7rZoJwvjJKHHh8nxWkik3ASmJi+ypG EFtEwEji84srYHFmgQSJzSsbmUFsYQFdib5lHWA1LAKqErdP3QKzeQU0Je4uPcsGYosKeEls 2dfOBBEXlPgx+R4LxBx5iX37p0LN1JJYv/M40wRGvllIymYhKZuFpGwBI/MqRonUguSC4qT0 XKO81HK94sTc4tK8dL3k/NxNjOAIeCa9g/HwLvdDjAIcjEo8vBu+ZEcIsSaWFVfmHmKU4GBW EuH99iInQog3JbGyKrUoP76oNCe1+BCjKdAjE5mlRJPzgdGZVxJvaGJuYm5sYGFuaWlipCTO 2zj7WbiQQHpiSWp2ampBahFMHxMHp1QD45r1EzmvZ6uslY2/nHghybGEX+mh63YdMyuXvB3p zLsUdzFKvriT2nd7acLfFfm2aYvPifR566tXxMVpcz0KDpARqVktYRSxnfE2x//tnW/t49l5 S3yX6rj47ds577KP9MXimcGtsv1fy/Z++PAwp13FxS4/zsVghe3TYCdX3wy92Dn7mK8psRRn JBpqMRcVJwIAyvSM7pYCAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170104124240epcas5p4e9c51bb5dc001506a5b7923dc1ef7623 X-Msg-Generator: CA X-Sender-IP: 203.254.230.27 X-Local-Sender: =?UTF-8?B?QmFydGxvbWllaiBab2xuaWVya2lld2ljehtTUlBPTC1LZXJu?= =?UTF-8?B?ZWwgKFRQKRvsgrzshLHsoITsnpAbU2VuaW9yIFNvZnR3YXJlIEVuZ2luZWVy?= X-Global-Sender: =?UTF-8?B?QmFydGxvbWllaiBab2xuaWVya2lld2ljehtTUlBPTC1LZXJu?= =?UTF-8?B?ZWwgKFRQKRtTYW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBF?= =?UTF-8?B?bmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 105P X-HopCount: 7 X-CMS-RootMailID: 20170104124240epcas5p4e9c51bb5dc001506a5b7923dc1ef7623 X-RootMTR: 20170104124240epcas5p4e9c51bb5dc001506a5b7923dc1ef7623 References: Cc: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi Linus, Please pull fbdev fixes for v4.10-rc2. They bring fbdev subsystem back into Maintained mode (with me as Maintainer) and add missing devm_ioremap() error checking to cobalt_lcdfb driver. Best regards, --- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics The following changes since commit 0c744ea4f77d72b3dcebb7a8f2684633ec79be88: Linux 4.10-rc2 (2017-01-01 14:31:53 -0800) are available in the git repository at: git://github.com/bzolnier/linux.git tags/fbdev-v4.10-rc2 for you to fetch changes up to 4dcd19bfabaee8f9f4bcf203afba09b98ccbaf76: video: fbdev: cobalt_lcdfb: Handle return NULL error from devm_ioremap (2017-01-04 12:58:45 +0100) ---------------------------------------------------------------- fbdev fixes for v4.10-rc2: - bring fbdev subsystem back into Maintained mode - add missing devm_ioremap() error checking to cobalt_lcdfb driver ---------------------------------------------------------------- Arvind Yadav (1): video: fbdev: cobalt_lcdfb: Handle return NULL error from devm_ioremap Bartlomiej Zolnierkiewicz (1): MAINTAINERS: add myself as maintainer of fbdev MAINTAINERS | 4 +++- drivers/video/fbdev/cobalt_lcdfb.c | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index cfff2c9..2775b14 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5080,9 +5080,11 @@ F: drivers/net/wan/dlci.c F: drivers/net/wan/sdla.c FRAMEBUFFER LAYER +M: Bartlomiej Zolnierkiewicz L: linux-fbdev@vger.kernel.org +T: git git://github.com/bzolnier/linux.git Q: http://patchwork.kernel.org/project/linux-fbdev/list/ -S: Orphan +S: Maintained F: Documentation/fb/ F: drivers/video/ F: include/video/ diff --git a/drivers/video/fbdev/cobalt_lcdfb.c b/drivers/video/fbdev/cobalt_lcdfb.c index 2d3b691..038ac69 100644 --- a/drivers/video/fbdev/cobalt_lcdfb.c +++ b/drivers/video/fbdev/cobalt_lcdfb.c @@ -308,6 +308,11 @@ static int cobalt_lcdfb_probe(struct platform_device *dev) info->screen_size = resource_size(res); info->screen_base = devm_ioremap(&dev->dev, res->start, info->screen_size); + if (!info->screen_base) { + framebuffer_release(info); + return -ENOMEM; + } + info->fbops = &cobalt_lcd_fbops; info->fix = cobalt_lcdfb_fix; info->fix.smem_start = res->start;