From 8a7a0ee25a1986aafc124cb0b77f61b219f4d505 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Mon, 12 Mar 2007 23:20:15 +0100 Subject: Fix suspend/resume in msp3400 and tuner From: Jean Delvare Cc: David Brownell Signed-off-by: Jean Delvare Signed-off-by: Hans Verkuil --- linux/drivers/media/video/tuner-core.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'linux/drivers/media/video/tuner-core.c') diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index 02fb067e2..e7bc60a5e 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -903,7 +903,11 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,14) +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,20) +static int tuner_suspend(struct i2c_client *c, pm_message_t state) +#else static int tuner_suspend(struct device *dev, pm_message_t state) +#endif #else #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) static int tuner_suspend(struct device *dev, pm_message_t state, u32 level) @@ -912,7 +916,9 @@ static int tuner_suspend(struct device *dev, u32 state, u32 level) #endif #endif { +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,20) struct i2c_client *c = container_of (dev, struct i2c_client, dev); +#endif struct tuner *t = i2c_get_clientdata (c); tuner_dbg ("suspend\n"); @@ -921,12 +927,18 @@ static int tuner_suspend(struct device *dev, u32 state, u32 level) } #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,14) +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,20) +static int tuner_resume(struct i2c_client *c) +#else static int tuner_resume(struct device *dev) +#endif #else static int tuner_resume(struct device *dev, u32 level) #endif { +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,20) struct i2c_client *c = container_of (dev, struct i2c_client, dev); +#endif struct tuner *t = i2c_get_clientdata (c); tuner_dbg ("resume\n"); @@ -955,13 +967,19 @@ static struct i2c_driver driver = { .attach_adapter = tuner_probe, .detach_client = tuner_detach, .command = tuner_command, +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,20) + .suspend = tuner_suspend, + .resume = tuner_resume, +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) .driver = { #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) .name = "tuner", #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,20) .suspend = tuner_suspend, .resume = tuner_resume, +#endif }, #endif }; -- cgit v1.2.3