Unverified Commit 0161b871 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'regmap-5.3' into regmap-linus

parents d45331b0 fba5b1e9

drivers/base/regmap/regmap-irq.c

+1 −6
Original line number Diff line number Diff line
@@ -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);