Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / net / wan / fsl_ucc_hdlc.c

diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c
index 2fc50ec..6f04445 100644 (file)
--- a/drivers/net/wan/fsl_ucc_hdlc.c
+++ b/drivers/net/wan/fsl_ucc_hdlc.c
@@ -862,7 +862,7 @@ static int uhdlc_suspend(struct device *dev)
 static int uhdlc_resume(struct device *dev)
 {
        struct ucc_hdlc_private *priv = dev_get_drvdata(dev);
-       struct ucc_tdm *utdm = priv->utdm;
+       struct ucc_tdm *utdm;
        struct ucc_tdm_info *ut_info;
        struct ucc_fast __iomem *uf_regs;
        struct ucc_fast_private *uccf;
@@ -877,6 +877,7 @@ static int uhdlc_resume(struct device *dev)
        if (!netif_running(priv->ndev))
                return 0;
 
+       utdm = priv->utdm;
        ut_info = priv->ut_info;
        uf_info = &ut_info->uf_info;
        uf_regs = priv->uf_regs;