if (gpadc->irq_sw >= 0) {
                ret = request_threaded_irq(gpadc->irq_sw, NULL,
                        ab8500_bm_gpadcconvend_handler,
-                       IRQF_NO_SUSPEND | IRQF_SHARED, "ab8500-gpadc-sw",
+                       IRQF_NO_SUSPEND | IRQF_SHARED | IRQF_ONESHOT,
+                       "ab8500-gpadc-sw",
                        gpadc);
                if (ret < 0) {
                        dev_err(gpadc->dev,
        if (gpadc->irq_hw >= 0) {
                ret = request_threaded_irq(gpadc->irq_hw, NULL,
                        ab8500_bm_gpadcconvend_handler,
-                       IRQF_NO_SUSPEND | IRQF_SHARED, "ab8500-gpadc-hw",
+                       IRQF_NO_SUSPEND | IRQF_SHARED | IRQF_ONESHOT,
+                       "ab8500-gpadc-hw",
                        gpadc);
                if (ret < 0) {
                        dev_err(gpadc->dev,