diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
| commit | 99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch) | |
| tree | 3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /drivers/char/buz.c | |
| parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) | |
Merge with Linux 2.3.38.
Diffstat (limited to 'drivers/char/buz.c')
| -rw-r--r-- | drivers/char/buz.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/char/buz.c b/drivers/char/buz.c index de688ae0b..4c4e44621 100644 --- a/drivers/char/buz.c +++ b/drivers/char/buz.c @@ -54,7 +54,7 @@ #include <linux/version.h> #include <asm/uaccess.h> -#include <linux/i2c.h> +#include <linux/i2c-old.h> #include "buz.h" #include <linux/video_decoder.h> #include <linux/video_encoder.h> @@ -3166,8 +3166,6 @@ static int zr36057_init(int i) mdelay(10); zr36060_reset(zr); mdelay(10); - zr36060_sleep(zr, 1); - mdelay(10); /* display codec revision */ if ((rev=zr36060_read_8(zr, 0x022)) == 0x33) { @@ -3204,8 +3202,6 @@ static int zr36057_init(int i) udelay(3000); zr36060_reset(zr); udelay(3000); - zr36060_sleep(zr, 1); - udelay(3000); /* display codec revision */ if ((rev=zr36060_read_8(zr, 0x022)) == 0x33) { @@ -3213,8 +3209,8 @@ static int zr36057_init(int i) zr->name, zr36060_read_8(zr, 0x023)); } else { printk(KERN_ERR "%s: Zoran ZR36060 not found (rev=%d)\n", zr->name, rev); -// kfree((void *) zr->stat_com); -// return -1; + kfree((void *) zr->stat_com); + return -1; } break; } |