From patchwork Mon Nov 23 14:21:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sjoerd Simons X-Patchwork-Id: 57152 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1463984lbb; Mon, 23 Nov 2015 06:21:26 -0800 (PST) X-Received: by 10.98.7.193 with SMTP id 62mr16314880pfh.22.1448288486325; Mon, 23 Nov 2015 06:21:26 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 7si19812927pfj.129.2015.11.23.06.21.25; Mon, 23 Nov 2015 06:21:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754991AbbKWOVY (ORCPT + 28 others); Mon, 23 Nov 2015 09:21:24 -0500 Received: from bhuna.collabora.co.uk ([46.235.227.227]:33044 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751646AbbKWOVW (ORCPT ); Mon, 23 Nov 2015 09:21:22 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: sjoerd) with ESMTPSA id 63B81261426 Received: by dusk.luon.net (Postfix, from userid 1000) id 98CD5231EB; Mon, 23 Nov 2015 15:21:18 +0100 (CET) From: Sjoerd Simons To: linux-media@vger.kernel.org Cc: =?UTF-8?q?Antti=20Sepp=C3=A4l=C3=A4?= , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, James Hogan , =?UTF-8?q?David=20H=C3=A4rdeman?= , Markus Elfring Subject: [PATCH] [media] rc-core: Try loading modules if the kernel supports them Date: Mon, 23 Nov 2015 15:21:18 +0100 Message-Id: <1448288478-23042-1-git-send-email-sjoerd.simons@collabora.co.uk> X-Mailer: git-send-email 2.6.2 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Always try to load modules for RC keymaps when the kernel supports modules, not just when the RC Core is build as a module. Fixes module autoloading issues when the core is builtin but the keymaps are not. Signed-off-by: Sjoerd Simons --- drivers/media/rc/rc-main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.6.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c index 3f0f71a..ea1008c 100644 --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c @@ -61,7 +61,7 @@ struct rc_map *rc_map_get(const char *name) struct rc_map_list *map; map = seek_rc_map(name); -#ifdef MODULE +#ifdef CONFIG_MODULES if (!map) { int rc = request_module("%s", name); if (rc < 0) {