diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
| commit | 8065248069097dddf9945acfb2081025e9618c16 (patch) | |
| tree | eddf3fb0372ba0f65c01382d386942ea8d18932d /arch/arm/mach-omap1/flash.c | |
| parent | e66a8ddff72e85605f2212a0ebc666c7e9116641 (diff) | |
| parent | b4838d12e1f3cb48c2489a0b08733b5dbf848297 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'arch/arm/mach-omap1/flash.c')
| -rw-r--r-- | arch/arm/mach-omap1/flash.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/arch/arm/mach-omap1/flash.c b/arch/arm/mach-omap1/flash.c index f9bf78d4fdf..401eb3c080c 100644 --- a/arch/arm/mach-omap1/flash.c +++ b/arch/arm/mach-omap1/flash.c @@ -17,20 +17,12 @@ void omap1_set_vpp(struct platform_device *pdev, int enable) { - static int count; u32 l; - if (enable) { - if (count++ == 0) { - l = omap_readl(EMIFS_CONFIG); - l |= OMAP_EMIFS_CONFIG_WP; - omap_writel(l, EMIFS_CONFIG); - } - } else { - if (count && (--count == 0)) { - l = omap_readl(EMIFS_CONFIG); - l &= ~OMAP_EMIFS_CONFIG_WP; - omap_writel(l, EMIFS_CONFIG); - } - } + l = omap_readl(EMIFS_CONFIG); + if (enable) + l |= OMAP_EMIFS_CONFIG_WP; + else + l &= ~OMAP_EMIFS_CONFIG_WP; + omap_writel(l, EMIFS_CONFIG); } |