Merge tag 'core-rcu-2021-04-28' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / platform / surface / aggregator / controller.c

diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c
index aa6f37b4f46e2b8c0784a62e7920492c5ec987b3..69e86cd599d38dce783d91b061ab5d3d6dbdf10b 100644 (file)
--- a/drivers/platform/surface/aggregator/controller.c
+++ b/drivers/platform/surface/aggregator/controller.c
@@ -1040,7 +1040,7 @@ static int ssam_dsm_load_u32(acpi_handle handle, u64 funcs, u64 func, u32 *ret)
        union acpi_object *obj;
        u64 val;
 
-       if (!(funcs & BIT(func)))
+       if (!(funcs & BIT_ULL(func)))
                return 0; /* Not supported, leave *ret at its default value */
 
        obj = acpi_evaluate_dsm_typed(handle, &SSAM_SSH_DSM_GUID,
@@ -2483,7 +2483,8 @@ int ssam_irq_setup(struct ssam_controller *ctrl)
         * interrupt, and let the SAM resume callback during the controller
         * resume process clear it.
         */
-       const int irqf = IRQF_SHARED | IRQF_ONESHOT | IRQF_TRIGGER_RISING;
+       const int irqf = IRQF_SHARED | IRQF_ONESHOT |
+                        IRQF_TRIGGER_RISING | IRQF_NO_AUTOEN;
 
        gpiod = gpiod_get(dev, "ssam_wakeup-int", GPIOD_ASIS);
        if (IS_ERR(gpiod))
@@ -2501,7 +2502,6 @@ int ssam_irq_setup(struct ssam_controller *ctrl)
                return status;
 
        ctrl->irq.num = irq;
-       disable_irq(ctrl->irq.num);
        return 0;
 }