Messages in this thread Patch in this message | | | Date | Fri, 09 Mar 2012 11:03:21 -0800 | From | Greg KH <> | Subject | [ 67/68] cs5535-mfgpt: dont call __init function from __devinit |
| |
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Danny Kukawka <danny.kukawka@bisect.de>
commit 474de3bbadd9cb75ffc32cc759c40d868343d46c upstream.
Fix scan_timers() to be __devinit and not __init since the function get called from cs5535_mfgpt_probe which is __devinit.
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- drivers/misc/cs5535-mfgpt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/misc/cs5535-mfgpt.c +++ b/drivers/misc/cs5535-mfgpt.c @@ -262,7 +262,7 @@ static void __init reset_all_timers(void * In other cases (such as with VSAless OpenFirmware), the system firmware * leaves timers available for us to use. */ -static int __init scan_timers(struct cs5535_mfgpt_chip *mfgpt) +static int __devinit scan_timers(struct cs5535_mfgpt_chip *mfgpt) { struct cs5535_mfgpt_timer timer = { .chip = mfgpt }; unsigned long flags;
| |