diff options
| author | Michael Krufky <devnull@localhost> | 2005-09-13 20:11:39 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-09-13 20:11:39 +0000 |
| commit | ee00178882ec47730e5d8f651135e482fa6f0cce (patch) | |
| tree | 6c3791a3920a4979ae7da6b5402996253f3e84d5 /linux/drivers/media/video/msp3400-driver.c | |
| parent | 450243867592096fe2ddde2134fd3f9c5c29c6b4 (diff) | |
| download | mediapointer-dvb-s2-ee00178882ec47730e5d8f651135e482fa6f0cce.tar.gz mediapointer-dvb-s2-ee00178882ec47730e5d8f651135e482fa6f0cce.tar.bz2 | |
* bt832.c: (bt832_probe):
* bttv-i2c.c: (attach_inform):
* cx88-i2c.c: (attach_inform), (detach_inform):
* id.h:
* ir-kbd-i2c.c: (ir_probe):
* msp3400.c: (msp34xx_sleep), (msp_attach):
* saa6588.c:
* saa6752hs.c:
* saa7134-i2c.c: (attach_inform):
* saa7134-tvaudio.c: (tvaudio_sleep):
* tda7432.c: (tda7432_probe):
* tda9875.c: (tda9875_probe):
* tda9887.c: (tda9887_probe):
* tuner-core.c:
* tveeprom.c: (tveeprom_attach_adapter):
* tvmixer.c: (tvmixer_ioctl), (tvmixer_clients),
(tvmixer_cleanup_module):
* video-buf.c: (videobuf_dma_free):
- Step two, in preparation for 2.6.14-rcX compatability:
- Compile tested against vanila kernels 2.6.13 & 2.6.8
- 2.6.14 compile still broken...
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'linux/drivers/media/video/msp3400-driver.c')
| -rw-r--r-- | linux/drivers/media/video/msp3400-driver.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index 9664fa119..b9ac5b2d1 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -750,9 +750,9 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout) set_current_state(TASK_INTERRUPTIBLE); schedule(); } else { -#if 0 - /* hmm, that one doesn't return on wakeup ... */ - msleep_interruptible(timeout); +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) + schedule_timeout_interruptible + (msecs_to_jiffies(timeout)); #else set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(msecs_to_jiffies(timeout)); @@ -1460,11 +1460,11 @@ static void msp_wake_thread(struct i2c_client *client); static struct i2c_driver driver = { .owner = THIS_MODULE, .name = "i2c msp3400 driver", - .id = I2C_DRIVERID_MSP3400, - .flags = I2C_DF_NOTIFY, - .attach_adapter = msp_probe, - .detach_client = msp_detach, - .command = msp_command, + .id = I2C_DRIVERID_MSP3400, + .flags = I2C_DF_NOTIFY, + .attach_adapter = msp_probe, + .detach_client = msp_detach, + .command = msp_command, .driver = { .suspend = msp_suspend, .resume = msp_resume, @@ -1473,9 +1473,9 @@ static struct i2c_driver driver = { static struct i2c_client client_template = { - I2C_DEVNAME("(unset)"), + .name = "(unset)", .flags = I2C_CLIENT_ALLOW_USE, - .driver = &driver, + .driver = &driver, }; static int msp_attach(struct i2c_adapter *adap, int addr, int kind) @@ -1549,7 +1549,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind) } /* hello world :-) */ - printk(KERN_INFO "msp34xx: init: chip=%s",i2c_clientname(c)); + printk(KERN_INFO "msp34xx: init: chip=%s", c->name); if (HAVE_NICAM(msp)) printk(" +nicam"); if (HAVE_SIMPLE(msp)) |