Skip to contentSkip to conversation

FAILED: patch "[PATCH] tpm_tis: fix build warning with tpm_tis_resume" failed to apply to 4.5-stable tree

PATCH [email protected] 1 participant 1 message Apr 10, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.5-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 2cb6d6460f1a171c71c134e0efe3a94c2206d080 Mon Sep 17 00:00:00 2001

From: Jarkko Sakkinen <[email protected]>
Date: Mon, 22 Feb 2016 16:09:12 +0200
Subject: [PATCH] tpm_tis: fix build warning with tpm_tis_resume
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

drivers/char/tpm/tpm_tis.c:838: warning: ‘tpm_tis_resume’ defined but not used

Fixes 00194826e6be ("tpm_tis: Clean up the force=1 module parameter")
drivers/char/tpm/tpm_tis.c +2 -0
index 2b2eff9e769e..a507006728e0 100644
@@ -814,6 +814,7 @@ out_err:
 	return rc;
 }
 
+#ifdef CONFIG_PM_SLEEP
 static void tpm_tis_reenable_interrupts(struct tpm_chip *chip)
 {
 	u32 intmask;
@@ -855,6 +856,7 @@ static int tpm_tis_resume(struct device *dev)
 
 	return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume);