diff options
author | Todd Kjos <tkjos@google.com> | 2017-03-02 13:53:48 -0800 |
---|---|---|
committer | Todd Kjos <tkjos@google.com> | 2017-03-02 13:53:48 -0800 |
commit | 837de638dc019843efb0f8744e299769af32e004 (patch) | |
tree | 3f693d421593332edcdf1d877433d31e9f1525de /drivers/platform | |
parent | f04805218728192d346291c1a0e78cb184142bad (diff) | |
parent | dd4534d88b93a911983503851ec9441787a4997d (diff) |
Merge branch 'upstream-linux-4.4.y' into android-4.4
Diffstat (limited to 'drivers/platform')
-rw-r--r-- | drivers/platform/goldfish/pdev_bus.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/platform/goldfish/pdev_bus.c b/drivers/platform/goldfish/pdev_bus.c index 1f52462f4cdd..dd9ea463c2a4 100644 --- a/drivers/platform/goldfish/pdev_bus.c +++ b/drivers/platform/goldfish/pdev_bus.c @@ -157,23 +157,26 @@ static int goldfish_new_pdev(void) static irqreturn_t goldfish_pdev_bus_interrupt(int irq, void *dev_id) { irqreturn_t ret = IRQ_NONE; + while (1) { u32 op = readl(pdev_bus_base + PDEV_BUS_OP); - switch (op) { - case PDEV_BUS_OP_DONE: - return IRQ_NONE; + switch (op) { case PDEV_BUS_OP_REMOVE_DEV: goldfish_pdev_remove(); + ret = IRQ_HANDLED; break; case PDEV_BUS_OP_ADD_DEV: goldfish_new_pdev(); + ret = IRQ_HANDLED; break; + + case PDEV_BUS_OP_DONE: + default: + return ret; } - ret = IRQ_HANDLED; } - return ret; } static int goldfish_pdev_bus_probe(struct platform_device *pdev) |