Home » Mailing list archives » linux-kernel » 2010 » April » 7

[PATCH] mfd: Fix WM831x I2C suspend prototype

Previous thread: PROBLEM + POSS FIX: kernel stack overflow, xfs, many disks, heavy write load, 8k stack, x86-64 by John Berthels on Wednesday, April 7, 2010 - 4:06 am. (17 messages)

Next thread: [PATCH] [RFC] ummunotify: Userspace support for MMU notifications by Eric B Munson on Wednesday, April 7, 2010 - 5:30 am. (2 messages)
[view original message]
From: Mark Brown
Subject: [PATCH] mfd: Fix WM831x I2C suspend prototype
Date: Wednesday, April 7, 2010 - 5:15 am

Sorry about the oversight.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 drivers/mfd/wm831x-core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index d4331b2..1a968f3 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -1767,7 +1767,7 @@ static int wm831x_i2c_remove(struct i2c_client *i2c)
 	return 0;
 }
 
-static int wm831x_i2c_suspend(struct i2c_client *i2c)
+static int wm831x_i2c_suspend(struct i2c_client *i2c, pm_message_t mesg)
 {
 	struct wm831x *wm831x = i2c_get_clientdata(i2c);
 
-- 
1.7.0.3

--


[ message continues ]
[view original message]
From: Samuel Ortiz
Subject: Re: [PATCH] mfd: Fix WM831x I2C suspend prototype
Date: Thursday, April 8, 2010 - 2:35 am

No problem. I wonder how that slipped through my compile tests...
Anyway, I merged it with your last wm831x-core patch.

Cheers,

-- 
Intel Open Source Technology Centre
http://oss.intel.com/
--


[ message continues ]
Previous thread: PROBLEM + POSS FIX: kernel stack overflow, xfs, many disks, heavy write load, 8k stack, x86-64 by John Berthels on Wednesday, April 7, 2010 - 4:06 am. (17 messages)

Next thread: [PATCH] [RFC] ummunotify: Userspace support for MMU notifications by Eric B Munson on Wednesday, April 7, 2010 - 5:30 am. (2 messages)