diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-27 12:09:07 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-27 12:09:07 -0400 |
| commit | 7da59d2fe30d8169c7c9e7b488beb1b9af932608 (patch) | |
| tree | 02438ff9c258cf80d3a3955215fbcff7bd7e392e /drivers/char | |
| parent | fea7a08acb13524b47711625eebea40a0ede69a0 (diff) | |
| parent | 877cdf3949cc67d00677a1dfb913001f324ac40d (diff) | |
Merge v3.6-rc3 into 'char-misc-next'
This resolves a conflict in:
drivers/misc/mei/interrupt.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tlclk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c index ce29e7cce528..e95e0ab0bd87 100644 --- a/drivers/char/tlclk.c +++ b/drivers/char/tlclk.c | |||
| @@ -784,8 +784,10 @@ static int __init tlclk_init(void) | |||
| 784 | } | 784 | } |
| 785 | tlclk_major = ret; | 785 | tlclk_major = ret; |
| 786 | alarm_events = kzalloc( sizeof(struct tlclk_alarms), GFP_KERNEL); | 786 | alarm_events = kzalloc( sizeof(struct tlclk_alarms), GFP_KERNEL); |
| 787 | if (!alarm_events) | 787 | if (!alarm_events) { |
| 788 | ret = -ENOMEM; | ||
| 788 | goto out1; | 789 | goto out1; |
| 790 | } | ||
| 789 | 791 | ||
| 790 | /* Read telecom clock IRQ number (Set by BIOS) */ | 792 | /* Read telecom clock IRQ number (Set by BIOS) */ |
| 791 | if (!request_region(TLCLK_BASE, 8, "telco_clock")) { | 793 | if (!request_region(TLCLK_BASE, 8, "telco_clock")) { |