diff --git a/[refs] b/[refs] index c87b448d0ce8..abb37fe65a79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c7a41691f37a1538a88e5eb9b0b73df1f834542 +refs/heads/master: 0cadaf45bd7c19f0bef49d1eebfff38a046b9ba4 diff --git a/trunk/drivers/pnp/resource.c b/trunk/drivers/pnp/resource.c index e7cf6bec737e..9fefe563f8fc 100644 --- a/trunk/drivers/pnp/resource.c +++ b/trunk/drivers/pnp/resource.c @@ -395,7 +395,8 @@ int pnp_check_irq(struct pnp_dev * dev, int idx) /* check if the resource is already in use, skip if the * device is active because it itself may be in use */ if(!dev->active) { - if (request_irq(*irq, pnp_test_handler, SA_INTERRUPT, "pnp", NULL)) + if (request_irq(*irq, pnp_test_handler, + SA_INTERRUPT|SA_PROBEIRQ, "pnp", NULL)) return 0; free_irq(*irq, NULL); }