summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa5246a.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/saa5246a.c')
-rw-r--r--linux/drivers/media/video/saa5246a.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa5246a.c b/linux/drivers/media/video/saa5246a.c
index d7faf20bc..1b19a72cc 100644
--- a/linux/drivers/media/video/saa5246a.c
+++ b/linux/drivers/media/video/saa5246a.c
@@ -387,7 +387,7 @@ MODULE_LICENSE("GPL");
#define MINUTE_MAX 0x59
#define PAGE_MAX 0x8FF
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
static unsigned short normal_i2c[] = { 0x11, I2C_CLIENT_END };
I2C_CLIENT_INSMOD;
@@ -1098,9 +1098,8 @@ static int saa5246a_probe(struct i2c_client *client,
/* Register it */
err = video_register_device(t->vdev, VFL_TYPE_VTX, -1);
if (err < 0) {
- kfree(t);
video_device_release(t->vdev);
- t->vdev = NULL;
+ kfree(t);
return err;
}
return 0;