renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 03:33:59 +08:00
Code

V4L/DVB (5421): Fix suspend/resume in msp3400 and tuner

Browse Source 
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Jean Delvare 2007-03-12 19:20:15 -03:00 committed by Mauro Carvalho Chehab
parent 3284b4e077
commit 21b48a70f7
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/video/msp3400-driver.c
View File

@ -780,18 +780,16 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
return 0;
}
static int msp_suspend(struct device * dev, pm_message_t state)
static int msp_suspend(struct i2c_client *client, pm_message_t state)
{
struct i2c_client *client = container_of(dev, struct i2c_client, dev);
v4l_dbg(1, msp_debug, client, "suspend\n");
msp_reset(client);
return 0;
}
static int msp_resume(struct device * dev)
static int msp_resume(struct i2c_client *client)
{
struct i2c_client *client = container_of(dev, struct i2c_client, dev);
v4l_dbg(1, msp_debug, client, "resume\n");
msp_wake_thread(client);
@ -996,11 +994,11 @@ static struct i2c_driver i2c_driver = {
.id = I2C_DRIVERID_MSP3400,
.attach_adapter = msp_probe,
.detach_client = msp_detach,
.suspend = msp_suspend,
.resume = msp_resume,
.command = msp_command,
.driver = {
.name = "msp3400",
.suspend = msp_suspend,
.resume = msp_resume,
},
};

10
drivers/media/video/tuner-core.c
View File

@ -804,9 +804,8 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
return 0;
}
static int tuner_suspend(struct device *dev, pm_message_t state)
static int tuner_suspend(struct i2c_client *c, pm_message_t state)
{
struct i2c_client *c = container_of (dev, struct i2c_client, dev);
struct tuner *t = i2c_get_clientdata (c);
tuner_dbg ("suspend\n");
@ -814,9 +813,8 @@ static int tuner_suspend(struct device *dev, pm_message_t state)
return 0;
}
static int tuner_resume(struct device *dev)
static int tuner_resume(struct i2c_client *c)
{
struct i2c_client *c = container_of (dev, struct i2c_client, dev);
struct tuner *t = i2c_get_clientdata (c);
tuner_dbg ("resume\n");
@ -837,10 +835,10 @@ static struct i2c_driver driver = {
.attach_adapter = tuner_probe,
.detach_client = tuner_detach,
.command = tuner_command,
.driver = {
.name = "tuner",
.suspend = tuner_suspend,
.resume = tuner_resume,
.driver = {
.name = "tuner",
},
};
static struct i2c_client client_template = {