提交 2c0056aa 编写于 作者: I Ian Abbott 提交者: Zheng Zengkai

staging: comedi: tests: ni_routes_test: Fix compilation error

stable inclusion
from stable-5.10.37
commit ab727e601cb50e76691566617681aa6a6651e7d6
bugzilla: 51868
CVE: NA

--------------------------------

[ Upstream commit 6db58ed2 ]

The `ni_routes_test` module is not currently selectable using the
Kconfig files, but can be built by specifying `CONFIG_COMEDI_TESTS=m` on
the "make" command line.  It currently fails to compile due to an extra
parameter added to the `ni_assign_device_routes` function by
commit e3b7ce73 ("staging: comedi: ni_routes: Allow alternate board
name for routes").  Fix it by supplying the value `NULL` for the added
`alt_board_name` parameter (which specifies that there is no alternate
board name).

Fixes: e3b7ce73 ("staging: comedi: ni_routes: Allow alternate board name for routes")
Cc: Spencer E. Olson <olsonse@umich.edu>
Signed-off-by: NIan Abbott <abbotti@mev.co.uk>
Link: https://lore.kernel.org/r/20210407140142.447250-2-abbotti@mev.co.ukSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 c7935a1c
......@@ -217,7 +217,8 @@ void test_ni_assign_device_routes(void)
const u8 *table, *oldtable;
init_pci_6070e();
ni_assign_device_routes(ni_eseries, pci_6070e, &private.routing_tables);
ni_assign_device_routes(ni_eseries, pci_6070e, NULL,
&private.routing_tables);
devroutes = private.routing_tables.valid_routes;
table = private.routing_tables.route_values;
......@@ -253,7 +254,8 @@ void test_ni_assign_device_routes(void)
olddevroutes = devroutes;
oldtable = table;
init_pci_6220();
ni_assign_device_routes(ni_mseries, pci_6220, &private.routing_tables);
ni_assign_device_routes(ni_mseries, pci_6220, NULL,
&private.routing_tables);
devroutes = private.routing_tables.valid_routes;
table = private.routing_tables.route_values;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册