From patchwork Wed Jul 15 07:15:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 6793861 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5E3FBC05AC for ; Wed, 15 Jul 2015 07:27:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8621E205E6 for ; Wed, 15 Jul 2015 07:27:42 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 4FC662056D for ; Wed, 15 Jul 2015 07:27:41 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 86871265A36; Wed, 15 Jul 2015 09:27:40 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 4BAFA265882; Wed, 15 Jul 2015 09:19:55 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 58F77265A2D; Wed, 15 Jul 2015 09:19:54 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 2E742265A39 for ; Wed, 15 Jul 2015 09:15:50 +0200 (CEST) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie1.idc.renesas.com with ESMTP; 15 Jul 2015 16:15:49 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id BFC9E4666A; Wed, 15 Jul 2015 16:15:49 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id BD2D88002E; Wed, 15 Jul 2015 16:15:49 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id B5F588002D; Wed, 15 Jul 2015 16:15:49 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac1.idc.renesas.com with ESMTP id SAB19584; Wed, 15 Jul 2015 16:15:49 +0900 X-IronPort-AV: E=Sophos;i="5.15,477,1432566000"; d="scan'";a="190395214" Received: from mail-pu1apc01lp0024.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.24]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 15 Jul 2015 16:15:48 +0900 Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; Received: from morimoto-PC.renesas.com (211.11.155.144) by SIXPR06MB0607.apcprd06.prod.outlook.com (10.160.237.149) with Microsoft SMTP Server (TLS) id 15.1.213.14; Wed, 15 Jul 2015 07:15:47 +0000 Message-ID: <87d1ztvqq6.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown In-Reply-To: <87d1ztx5pb.wl%kuninori.morimoto.gx@renesas.com> References: <87d1ztx5pb.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Wed, 15 Jul 2015 07:15:47 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0042.jpnprd01.prod.outlook.com (25.164.161.152) To SIXPR06MB0607.apcprd06.prod.outlook.com (25.160.237.149) X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0607; 2:+Reckekqf+GGQLhMnnjz3wgOzKlUCPR4I9hdxv9XqTwplhRmz45st3Mv/8n/2+W+; 3:F1BdcjMCd3GnxJAu9wtp/WYw5DdtQsK3/7lp1dmtwu44SonYHZnYj88INwx+5pNSSk0vyR+4qZ8ZD12QIlOlWPyZC5yWyxO/Gwi6GwYqhbLzn6XgEBTllZryeHPpEhUfFwLmQU9SUQE+UWalQ8j+JA==; 25:pbhTquIAjbGHRrw4fLAMyUl7YE6DChEXLyWCTcjDRP1VCufR2uUWxujQH3fYsieb1dgJTWHUafXMCUWfgDgLOq0XmG0zrIuAQhWKd9nKBqPZLaDQ26jrchWnZysKXjzKdcOd7S3FWBO536ELACP2OXl1YXjidHHuEUoUUl9UIyuWQIkzIUGMLgO3ZWIKYdltC76J/j5jwF+vV2GuS3ehYkZxti26dQ+ZiWsinK2xu8JZQk/9BQvbqP0GYQtRWGti7WCQriLOq/nsE2QxZqPaAw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SIXPR06MB0607; X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0607; 20:nCw6hQJ+p7ggwOS1mn5QMAn5r9YYLhotgUDrMq3rIetVOpMXTKmlyMNy6Xm/K6YMFl32LfdUciFuMMgYl+EsMGaqkHnFgzScF6nmqY5g3omgexR+9ZRAfJya9lCsEVZjBsWTwBFwviAOvDLFoIBqQH8LogkDDPzYj2R1fwDmtLHNepji5ABbxrJ0seszg0jpdmpINjaBZkrQL7qOg7m2GT5me3d1gF7fHOzsyrtutYLnltueHgD61aOUPblf2DJ6n3PtuBNFhDS54+3SMiVW4ajbb0apjgH+/cRdfIwJJ0+LD5TLUmbFr04ENsqsP6gzRi+8Jy0V1CP5hNX9xBXUWWCJ+V0bnaz8GcUrT8NdJdm6I3ClerHTJo0FEwebZGOdFEt+5/IPJbB0JHM6pFdDjNIMCNb8BGOQjzCvfOu9T4+Uz/60tjhFNCDwXIQ48rZprh32AHFKWJKRWwcyDQWZ8OlEdbqafDkygxmEwgNfu9Ch3mX6x49LvZn64yjSCDbN; 4:JXswsgYj2t5llhFo7wesaFcuYvLOmssJLz04HA06IQVckAr4q7YIaQH3MCFx+ZnChBvAYq2REnBhvckYoxGDrXDTNENc0V1r4oJBoJRVLABmh7bRC6ZYfq+vTmdiqJ9ZPawPvUDkOjeJc8l84HCgilSaGKMgjFJWeDtlXShBs00u9Gt2keftQLlBT52IiV0jlAP4kf+rXw/xrb/6QI6t2eQlOKeBCz83DHU+ahTVujAz4pjnPkq550ozL8/qOfi5mkFxy2PAzal6Mh4caQvDPYsuWstjgfYtHYoH6WKUeP4= SIXPR06MB0607: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:SIXPR06MB0607; BCL:0; PCL:0; RULEID:; SRVR:SIXPR06MB0607; X-Forefront-PRVS: 0638FD5066 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(87976001)(62966003)(77156002)(122386002)(36756003)(40100003)(46102003)(46406003)(92566002)(66066001)(2950100001)(76176999)(54356999)(50466002)(53416004)(50986999)(19580405001)(42186005)(23726002)(189998001)(19580395003)(229853001)(77096005)(47776003)(33646002)(83506001)(110136002)(86362001)(107886002)(5001960100002)(4001350100001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:SIXPR06MB0607; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0607; 23:lJjYaWL+vhvPNQe+UDKO6JCrDtml7IhGyrc3g/KMxCi1dW9BbvjhYLGwTFyJTAtaAdSDCXu9IMLckv37eNe77JdkphBcGMtGhx1SwwegRHxg57mjRKtzoKN7o3sxnbvB/h1P6DKBraF2HyHB41FIGoxiIVWqJMzXqferUQyp4+s/PEpyFvrnGiyI7WhaWNaQmDwXGpms2gLxSGEVQMSSG+jtSZ8o+cYayn6RZNC9MyDi5wQnBTy7Sk9TIy4Hp8y9er3j/Tyw3B9sh7Gm1oNAT3ILI/s6Sgbwa+QbP9G0X9eRN7+Fwg6rBI5R7UVeCQkjV6yg4HXuKXep9Y95EJauSSEFXHBKmX9r3uMDt2YfyqeIKdFnV+BqAMHGXMQpEp73gpWCVuWfY6JYzyyFivDFSgErlv+ZaWojG/xupM48IX04/S8p3XqO8ABAOg1cRscq0wcbplNt1k10VElyZV4AnyVqqcTERZcsh17z6CDET8Ucr+KQa9roI453HfjZEPO4Tln5PG+0SeN7r5w4i7I5CBw9LHEh3LmHs6yqHdMS+rCmhPVV1REQ8ni9E7eGWw4zxgBCceSoCpV5+2Fd3rme9Q5YpOt0AYTrc9NSDoMDPn83/CIfNvq9lS+w1+BCNzQ/ueD1uKiYy8I145/2/4owgRi66N+G3EXBBsqZj6SwOBObMXonmRXlQ2EqBIy0+qGTKvfk8bLaJjpvEujm4qS4u9oKst1siVLEx3MRF1/WAkf7lOfKcd07GOLCqOHLX/XIRWY2Qeqm3gNbO5BnBPWdQX4o3F0Adaa4AIeDsm17JFNS3CWHIqrFF05aEoeSsyAdGLysE6vNjNZAKIwNIffOoXipCKjH465c6DccTL2j+rgsRa72oiSByYYic6v18zOW1beY92jHpAJM7jS8TP3AUA== X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0607; 5:jQXee/nUSpvHake5DNZTRWwoz2jMv6KmvkC9jBt5rmjbwGEctoWtWf7bPe8tUnWAbHQRFdpTAWnQjlXrYLuVYjtkmSzQdN/2r9VcIxB7pF3lzuQTcQABiSbaA+oNLPAl0XEhDTWDNqfbSfWhuCJg7A==; 24:IYBLfkqpAX4VYtalCvKtzxgZcLGIUZPRQXGyc/J7hYfRImAzufxoLLrHlDiYMjPiGhcUEmQNeWckZXjz+67GzBZrWxAdbOqRihtNkkFxm0c=; 20:wJRXgDcMIS5+oBCCBDoFaL0m0IBcTHsFYuLQfrZbN87co21UAlJM3QrBD9fc+oxh9BnDazAi/PBO2GRv1j0/5mYmx4S6crgKTmJhzQur9bz6tGglzyWKPBDfUNGnscgQW26lrlInNokU487huOOMb2SqnhyQevzywgRJZar/gjs= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2015 07:15:47.0567 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SIXPR06MB0607 Cc: Linux-ALSA , shiiba , Liam Girdwood , komatsu , kobayashi , Simon Subject: [alsa-devel] [PATCH 25/35] ASoC: rsnd: check the Gen1 at the beginning of DVC probe X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto DVC doesn't support Gen1, check it beginning of probe Signed-off-by: Kuninori Morimoto Tested-by: Keita Kobayashi --- sound/soc/sh/rcar/dvc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c index d06e4ee..5779638 100644 --- a/sound/soc/sh/rcar/dvc.c +++ b/sound/soc/sh/rcar/dvc.c @@ -332,18 +332,18 @@ int rsnd_dvc_probe(struct platform_device *pdev, char name[RSND_DVC_NAME_SIZE]; int i, nr, ret; - rsnd_of_parse_dvc(pdev, of_data, priv); - - nr = info->dvc_info_nr; - if (!nr) - return 0; - /* This driver doesn't support Gen1 at this point */ if (rsnd_is_gen1(priv)) { dev_warn(dev, "CMD is not supported on Gen1\n"); return -EINVAL; } + rsnd_of_parse_dvc(pdev, of_data, priv); + + nr = info->dvc_info_nr; + if (!nr) + return 0; + dvc = devm_kzalloc(dev, sizeof(*dvc) * nr, GFP_KERNEL); if (!dvc) return -ENOMEM;