Message ID | 1330086194-21762-8-git-send-email-amit.virdi@st.com |
---|---|
State | Accepted |
Commit | a59c7b37b908639f9daa7fe50d4646b3947e2d62 |
Delegated to: | Stefan Roese |
Headers | show |
diff --git a/drivers/mtd/st_smi.c b/drivers/mtd/st_smi.c index 7b4c6f3..eb902b2 100644 --- a/drivers/mtd/st_smi.c +++ b/drivers/mtd/st_smi.c @@ -148,7 +148,7 @@ static ulong flash_get_size(ulong base, int banknum) */ static int smi_read_sr(int bank) { - u32 ctrlreg1; + u32 ctrlreg1, val; /* store the CTRL REG1 state */ ctrlreg1 = readl(&smicntl->smi_cr1); @@ -163,10 +163,12 @@ static int smi_read_sr(int bank) if (smi_wait_xfer_finish(XFER_FINISH_TOUT)) return -1; + val = readl(&smicntl->smi_sr); + /* Restore the CTRL REG1 state */ writel(ctrlreg1, &smicntl->smi_cr1); - return readl(&smicntl->smi_sr); + return val; } /*