diff options
| author | Gerd Knorr <devnull@localhost> | 2005-01-17 12:38:11 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2005-01-17 12:38:11 +0000 |
| commit | 9a05e073d8551b8f44c63031b039aaa5cc01e3b9 (patch) | |
| tree | 4051627804d186b2a3fa58f72f9bbd6853558af6 | |
| parent | 49ee5355f240b409e6e7fc547da28c28746e870a (diff) | |
| download | mediapointer-dvb-s2-9a05e073d8551b8f44c63031b039aaa5cc01e3b9.tar.gz mediapointer-dvb-s2-9a05e073d8551b8f44c63031b039aaa5cc01e3b9.tar.bz2 | |
- fix tveeprom.
| -rw-r--r-- | linux/drivers/media/video/tveeprom.c | 6 | ||||
| -rw-r--r-- | v4l/scripts/update | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c index 9c3638c18..d4448de13 100644 --- a/linux/drivers/media/video/tveeprom.c +++ b/linux/drivers/media/video/tveeprom.c @@ -515,7 +515,7 @@ tveeprom_detect_client(struct i2c_adapter *adapter, dprintk(1,"%s: id 0x%x @ 0x%x\n",__FUNCTION__, adapter->id, address << 1); client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); - if (client == 0) + if (NULL == client) return -ENOMEM; memset(client, 0, sizeof(struct i2c_client)); client->addr = address; @@ -523,6 +523,7 @@ tveeprom_detect_client(struct i2c_adapter *adapter, client->driver = &i2c_driver_tveeprom; client->flags = I2C_CLIENT_ALLOW_USE; snprintf(client->name, sizeof(client->name), "tveeprom"); + i2c_attach_client(client); return 0; } @@ -541,9 +542,8 @@ tveeprom_detach_client (struct i2c_client *client) int err; err = i2c_detach_client(client); - if (err) + if (err < 0) return err; - kfree(client); return 0; } diff --git a/v4l/scripts/update b/v4l/scripts/update index b100b9db7..050ecb22b 100644 --- a/v4l/scripts/update +++ b/v4l/scripts/update @@ -99,5 +99,5 @@ xinsmod saa7134-empress xinsmod cx22702 debug=0 xinsmod mt352 debug=0 xinsmod video-buf-dvb -#xinsmod cx88-dvb +xinsmod cx88-dvb xinsmod saa7134-dvb |