On Thu, 02 Oct 2014, Thierry Reding wrote: > From: Thierry Reding <tred...@nvidia.com> > > rtsx_pci_power_off() is called only from rtsx_pci_suspend(), which isn't > built when PM is disabled. > > Signed-off-by: Thierry Reding <tred...@nvidia.com> > --- > drivers/mfd/rtsx_pcr.c | 2 ++ > 1 file changed, 2 insertions(+)
Applied to fixes. > diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c > index f2643c221d34..30f7ca89a0e6 100644 > --- a/drivers/mfd/rtsx_pcr.c > +++ b/drivers/mfd/rtsx_pcr.c > @@ -947,6 +947,7 @@ static void rtsx_pci_idle_work(struct work_struct *work) > mutex_unlock(&pcr->pcr_mutex); > } > > +#ifdef CONFIG_PM > static void rtsx_pci_power_off(struct rtsx_pcr *pcr, u8 pm_state) > { > if (pcr->ops->turn_off_led) > @@ -961,6 +962,7 @@ static void rtsx_pci_power_off(struct rtsx_pcr *pcr, u8 > pm_state) > if (pcr->ops->force_power_down) > pcr->ops->force_power_down(pcr, pm_state); > } > +#endif > > static int rtsx_pci_init_hw(struct rtsx_pcr *pcr) > { -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/