Merge tag '6.6-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6

[sfrench/cifs-2.6.git] / drivers / staging / fieldbus / anybuss / arcx-anybus.c

diff --git a/drivers/staging/fieldbus/anybuss/arcx-anybus.c b/drivers/staging/fieldbus/anybuss/arcx-anybus.c
index f135b9f52c8d9f9682ac83dae36eab6a37c680bc..6f69758a8b271357f8260694d5225588156905be 100644 (file)
--- a/drivers/staging/fieldbus/anybuss/arcx-anybus.c
+++ b/drivers/staging/fieldbus/anybuss/arcx-anybus.c
@@ -156,8 +156,8 @@ create_anybus_host(struct platform_device *pdev, int idx)
        if (IS_ERR(ops.regmap))
                return ERR_CAST(ops.regmap);
        ops.irq = platform_get_irq(pdev, idx);
-       if (ops.irq <= 0)
-               return ERR_PTR(-EINVAL);
+       if (ops.irq < 0)
+               return ERR_PTR(ops.irq);
        return devm_anybuss_host_common_probe(&pdev->dev, &ops);
 }
 
@@ -343,7 +343,7 @@ static struct platform_driver controller_driver = {
        .remove_new = controller_remove,
        .driver         = {
                .name   = "arcx-anybus-controller",
-               .of_match_table = of_match_ptr(controller_of_match),
+               .of_match_table = controller_of_match,
        },
 };