git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
media
/
video
/
zr36016.c
diff --git
a/drivers/media/video/zr36016.c
b/drivers/media/video/zr36016.c
index
d4740a8
..
62f7758
100644
(file)
--- a/
drivers/media/video/zr36016.c
+++ b/
drivers/media/video/zr36016.c
@@
-26,7
+26,6
@@
#define ZR016_VERSION "v0.7"
#define ZR016_VERSION "v0.7"
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
@@
-35,7
+34,7
@@
#include <linux/types.h>
#include <linux/wait.h>
#include <linux/types.h>
#include <linux/wait.h>
-/* includes for structures and defines regarding video
+/* includes for structures and defines regarding video
#include<linux/videodev.h> */
/* I/O commands, error codes */
#include<linux/videodev.h> */
/* I/O commands, error codes */
@@
-144,8
+143,8
@@
zr36016_readi (struct zr36016 *ptr,
static void
zr36016_writei (struct zr36016 *ptr,
static void
zr36016_writei (struct zr36016 *ptr,
- u16 reg,
- u8 value)
+ u16 reg,
+ u8 value)
{
dprintk(4, "%s: writing indirect 0x%02x to 0x%04x\n", ptr->name,
value, reg);
{
dprintk(4, "%s: writing indirect 0x%02x to 0x%04x\n", ptr->name,
value, reg);
@@
-193,7
+192,7
@@
zr36016_basic_test (struct zr36016 *ptr)
dprintk(1, "\n");
}
// for testing just write 0, then the default value to a register and read
dprintk(1, "\n");
}
// for testing just write 0, then the default value to a register and read
- // it back in both cases
+ // it back in both cases
zr36016_writei(ptr, ZR016I_PAX_LO, 0x00);
if (zr36016_readi(ptr, ZR016I_PAX_LO) != 0x0) {
dprintk(1,
zr36016_writei(ptr, ZR016I_PAX_LO, 0x00);
if (zr36016_readi(ptr, ZR016I_PAX_LO) != 0x0) {
dprintk(1,
@@
-233,17
+232,17
@@
zr36016_basic_test (struct zr36016 *ptr)
static int zr36016_pushit (struct zr36016 *ptr,
u16 startreg,
u16 len,
static int zr36016_pushit (struct zr36016 *ptr,
u16 startreg,
u16 len,
-
const char *data)
+ const char *data)
{
{
-
int i=0;
+ int i=0;
-
dprintk(4, "%s: write data block to 0x%04x (len=%d)\n",
+ dprintk(4, "%s: write data block to 0x%04x (len=%d)\n",
ptr->name, startreg,len);
ptr->name, startreg,len);
-
while (i<len) {
-
zr36016_writei(ptr, startreg++, data[i++]);
-
}
+ while (i<len) {
+ zr36016_writei(ptr, startreg++, data[i++]);
+ }
-
return i;
+ return i;
}
#endif
}
#endif
@@
-452,12
+451,11
@@
zr36016_setup (struct videocodec *codec)
return -ENOSPC;
}
//mem structure init
return -ENOSPC;
}
//mem structure init
- codec->data = ptr = k
m
alloc(sizeof(struct zr36016), GFP_KERNEL);
+ codec->data = ptr = k
z
alloc(sizeof(struct zr36016), GFP_KERNEL);
if (NULL == ptr) {
dprintk(1, KERN_ERR "zr36016: Can't get enough memory!\n");
return -ENOMEM;
}
if (NULL == ptr) {
dprintk(1, KERN_ERR "zr36016: Can't get enough memory!\n");
return -ENOMEM;
}
- memset(ptr, 0, sizeof(struct zr36016));
snprintf(ptr->name, sizeof(ptr->name), "zr36016[%d]",
zr36016_codecs);
snprintf(ptr->name, sizeof(ptr->name), "zr36016[%d]",
zr36016_codecs);