Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb7aed27 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: smb1398: Do not register the die-temperature-shutdown interrupt"

parents be70d6a3 7b107309
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ static int smb1398_get_die_temp(struct smb1398_chip *chip, int *temp)
		dev_err(chip->dev, "Couldn't read die_temp_chan, rc=%d\n", rc);
	} else {
		*temp = die_temp_deciC / 100;
		dev_dbg(chip->dev, "Couldn't get die temp %d\n", *temp);
		dev_dbg(chip->dev, "die temp %d\n", *temp);
	}

	return rc;
@@ -1429,6 +1429,13 @@ static int smb1398_request_interrupt(struct smb1398_chip *chip,
	if (!smb_irqs[irq_index].handler)
		return 0;

	/*
	 * Do not register temp-shdwn interrupt as it may misfire on toggling
	 * the SMB_EN input.
	 */
	if (irq_index == TEMP_SHDWN_IRQ)
		return 0;

	rc = devm_request_threaded_irq(chip->dev, irq, NULL,
			smb_irqs[irq_index].handler,
			IRQF_ONESHOT, irq_name, chip);