diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 18:37:35 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 18:37:35 -0300 |
| commit | 28f0a28c5e0c37bee44d914bde9533d5fc16b62d (patch) | |
| tree | 45734415c0154d7f08df6b7ec69ca41fe2d016cd /linux/drivers/media/video | |
| parent | ab4c84b189fc450ac5edee0d4461b0c1bf0c86c6 (diff) | |
| download | mediapointer-dvb-s2-28f0a28c5e0c37bee44d914bde9533d5fc16b62d.tar.gz mediapointer-dvb-s2-28f0a28c5e0c37bee44d914bde9533d5fc16b62d.tar.bz2 | |
Backport language typo and whitespace differences
From: Mauro Carvalho Chehab <mchehab@redhat.com>
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/hdpvr/hdpvr-video.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-i2c.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/hdpvr/hdpvr-video.c b/linux/drivers/media/video/hdpvr/hdpvr-video.c index 3e6ffee8d..ccd47f57f 100644 --- a/linux/drivers/media/video/hdpvr/hdpvr-video.c +++ b/linux/drivers/media/video/hdpvr/hdpvr-video.c @@ -181,7 +181,7 @@ static int hdpvr_submit_buffers(struct hdpvr_device *dev) buff_list); if (buf->status != BUFSTAT_AVAILABLE) { v4l2_err(&dev->v4l2_dev, - "buffer not marked as availbale\n"); + "buffer not marked as available\n"); ret = -EFAULT; goto err; } diff --git a/linux/drivers/media/video/ivtv/ivtv-i2c.c b/linux/drivers/media/video/ivtv/ivtv-i2c.c index eed4d2364..484a323f1 100644 --- a/linux/drivers/media/video/ivtv/ivtv-i2c.c +++ b/linux/drivers/media/video/ivtv/ivtv-i2c.c @@ -639,6 +639,7 @@ int init_ivtv_i2c(struct ivtv *itv) retval = i2c_add_adapter(&itv->i2c_adap); else retval = i2c_bit_add_bus(&itv->i2c_adap); + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) /* Instantiate the IR receiver device, if present */ if (retval == 0) { @@ -666,6 +667,7 @@ int init_ivtv_i2c(struct ivtv *itv) i2c_new_probed_device(&itv->i2c_adap, &info, addr_list); } #endif + return retval; } |