forked from Minki/linux
Merge branch 'regmap-5.3' into regmap-linus
This commit is contained in:
commit
0161b87164
@ -370,7 +370,6 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
|
||||
if (ret < 0) {
|
||||
dev_err(map->dev, "IRQ thread failed to resume: %d\n",
|
||||
ret);
|
||||
pm_runtime_put(map->dev);
|
||||
goto exit;
|
||||
}
|
||||
}
|
||||
@ -425,8 +424,6 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
|
||||
dev_err(map->dev,
|
||||
"Failed to read IRQ status %d\n",
|
||||
ret);
|
||||
if (chip->runtime_pm)
|
||||
pm_runtime_put(map->dev);
|
||||
goto exit;
|
||||
}
|
||||
}
|
||||
@ -478,8 +475,6 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
|
||||
dev_err(map->dev,
|
||||
"Failed to read IRQ status: %d\n",
|
||||
ret);
|
||||
if (chip->runtime_pm)
|
||||
pm_runtime_put(map->dev);
|
||||
goto exit;
|
||||
}
|
||||
}
|
||||
@ -513,10 +508,10 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
|
||||
}
|
||||
}
|
||||
|
||||
exit:
|
||||
if (chip->runtime_pm)
|
||||
pm_runtime_put(map->dev);
|
||||
|
||||
exit:
|
||||
if (chip->handle_post_irq)
|
||||
chip->handle_post_irq(chip->irq_drv_data);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user