V4L/DVB (12734): cx25821: Fix some compilation troubles

Lindent caused some compilation breakages. There were also others
related to some other changes at kernel KABI.

There's still one missing warning fix against 2.6.30:

/home/v4l/cx25821/v4l/cx25821-alsa.c: In function 'cx25821_audio_initdev':
/home/v4l/cx25821/v4l/cx25821-alsa.c:706: warning: 'snd_card_new' is deprecated (declared at include/sound/core.h:306)

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2009-09-13 11:39:12 -03:00
parent 1a9fc85564
commit 53e712d084
4 changed files with 8 additions and 10 deletions

View file

@ -679,14 +679,13 @@ static int cx25821_audio_initdev(struct cx25821_dev *dev)
return (-ENOENT);
}
card =
snd_card_new(index[devno], id[devno], THIS_MODULE,
sizeof(snd_cx25821_card_t));
if (!card) {
err = snd_card_create(index[devno], id[devno], THIS_MODULE,
sizeof(snd_cx25821_card_t), &card);
if (err < 0) {
printk(KERN_INFO
"DEBUG ERROR: cannot create snd_card_new in %s\n",
__func__);
return (-ENOMEM);
return err;
}
strcpy(card->driver, "cx25821");

View file

@ -287,7 +287,6 @@ static struct i2c_algorithm cx25821_i2c_algo_template = {
static struct i2c_adapter cx25821_i2c_adap_template = {
.name = "cx25821",
.owner = THIS_MODULE,
.id = I2C_HW_B_CX25821,
.algo = &cx25821_i2c_algo_template,
};