diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:55:03 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:55:03 -0500 |
| commit | 4c5f830c4c9d4f19c1eef356c0cd322b46d695c9 (patch) | |
| tree | a14ad6c652736bb28859a7aec392a01b236ae58d /arch/arm/mach-omap2/smartreflex.c | |
| parent | cc511b8d84d88ab788cddbfe8d21485b1c387493 (diff) | |
| parent | 2e3d256de9d3db5a7ca19b61305627a516b54b45 (diff) | |
Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD
Conflicts:
arch/arm/plat-omap/include/plat/common.h
Diffstat (limited to 'arch/arm/mach-omap2/smartreflex.c')
| -rw-r--r-- | arch/arm/mach-omap2/smartreflex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c index 919d827ed707..9dd93453e563 100644 --- a/arch/arm/mach-omap2/smartreflex.c +++ b/arch/arm/mach-omap2/smartreflex.c | |||
| @@ -139,7 +139,7 @@ static irqreturn_t sr_interrupt(int irq, void *data) | |||
| 139 | sr_write_reg(sr_info, ERRCONFIG_V1, status); | 139 | sr_write_reg(sr_info, ERRCONFIG_V1, status); |
| 140 | } else if (sr_info->ip_type == SR_TYPE_V2) { | 140 | } else if (sr_info->ip_type == SR_TYPE_V2) { |
| 141 | /* Read the status bits */ | 141 | /* Read the status bits */ |
| 142 | sr_read_reg(sr_info, IRQSTATUS); | 142 | status = sr_read_reg(sr_info, IRQSTATUS); |
| 143 | 143 | ||
| 144 | /* Clear them by writing back */ | 144 | /* Clear them by writing back */ |
| 145 | sr_write_reg(sr_info, IRQSTATUS, status); | 145 | sr_write_reg(sr_info, IRQSTATUS, status); |