git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (8818): gspca: Reinitialize the device on resume.
[safe/jmp/linux-2.6]
/
drivers
/
media
/
video
/
saa6588.c
diff --git
a/drivers/media/video/saa6588.c
b/drivers/media/video/saa6588.c
index
e70b17e
..
f050242
100644
(file)
--- a/
drivers/media/video/saa6588.c
+++ b/
drivers/media/video/saa6588.c
@@
-31,8
+31,7
@@
#include <linux/wait.h>
#include <asm/uaccess.h>
#include <linux/wait.h>
#include <asm/uaccess.h>
-
-#include "rds.h"
+#include <media/rds.h>
/* Addresses to scan */
static unsigned short normal_i2c[] = {
/* Addresses to scan */
static unsigned short normal_i2c[] = {
@@
-44,21
+43,21
@@
static unsigned short normal_i2c[] = {
I2C_CLIENT_INSMOD;
/* insmod options */
I2C_CLIENT_INSMOD;
/* insmod options */
-static unsigned int debug
= 0
;
-static unsigned int xtal
= 0
;
-static unsigned int rbds
= 0
;
-static unsigned int plvl
= 0
;
+static unsigned int debug;
+static unsigned int xtal;
+static unsigned int rbds;
+static unsigned int plvl;
static unsigned int bufblocks = 100;
static unsigned int bufblocks = 100;
-
MODULE_PARM(debug, "i"
);
+
module_param(debug, int, 0644
);
MODULE_PARM_DESC(debug, "enable debug messages");
MODULE_PARM_DESC(debug, "enable debug messages");
-
MODULE_PARM(xtal, "i"
);
+
module_param(xtal, int, 0
);
MODULE_PARM_DESC(xtal, "select oscillator frequency (0..3), default 0");
MODULE_PARM_DESC(xtal, "select oscillator frequency (0..3), default 0");
-
MODULE_PARM(rbds, "i"
);
+
module_param(rbds, int, 0
);
MODULE_PARM_DESC(rbds, "select mode, 0=RDS, 1=RBDS, default 0");
MODULE_PARM_DESC(rbds, "select mode, 0=RDS, 1=RBDS, default 0");
-
MODULE_PARM(plvl, "i"
);
+
module_param(plvl, int, 0
);
MODULE_PARM_DESC(plvl, "select pause level (0..3), default 0");
MODULE_PARM_DESC(plvl, "select pause level (0..3), default 0");
-
MODULE_PARM(bufblocks, "i"
);
+
module_param(bufblocks, int, 0
);
MODULE_PARM_DESC(bufblocks, "number of buffered blocks, default 100");
MODULE_DESCRIPTION("v4l2 driver module for SAA6588 RDS decoder");
MODULE_PARM_DESC(bufblocks, "number of buffered blocks, default 100");
MODULE_DESCRIPTION("v4l2 driver module for SAA6588 RDS decoder");
@@
-212,8
+211,10
@@
static void read_from_buf(struct saa6588 *s, struct rds_command *a)
if (rd_blocks > s->block_count)
rd_blocks = s->block_count;
if (rd_blocks > s->block_count)
rd_blocks = s->block_count;
- if (!rd_blocks)
+ if (!rd_blocks) {
+ spin_unlock_irqrestore(&s->lock, flags);
return;
return;
+ }
for (i = 0; i < rd_blocks; i++) {
if (block_to_user_buf(s, buf_ptr)) {
for (i = 0; i < rd_blocks; i++) {
if (block_to_user_buf(s, buf_ptr)) {
@@
-322,9
+323,9
@@
static void saa6588_timer(unsigned long data)
schedule_work(&s->work);
}
schedule_work(&s->work);
}
-static void saa6588_work(
void *data
)
+static void saa6588_work(
struct work_struct *work
)
{
{
- struct saa6588 *s =
(struct saa6588 *)data
;
+ struct saa6588 *s =
container_of(work, struct saa6588, work)
;
saa6588_i2c_poll(s);
mod_timer(&s->timer, jiffies + msecs_to_jiffies(20));
saa6588_i2c_poll(s);
mod_timer(&s->timer, jiffies + msecs_to_jiffies(20));
@@
-404,6
+405,7
@@
static int saa6588_attach(struct i2c_adapter *adap, int addr, int kind)
kfree(s);
return -ENOMEM;
}
kfree(s);
return -ENOMEM;
}
+ spin_lock_init(&s->lock);
s->client = client_template;
s->block_count = 0;
s->wr_index = 0;
s->client = client_template;
s->block_count = 0;
s->wr_index = 0;
@@
-417,7
+419,7
@@
static int saa6588_attach(struct i2c_adapter *adap, int addr, int kind)
saa6588_configure(s);
/* start polling via eventd */
saa6588_configure(s);
/* start polling via eventd */
- INIT_WORK(&s->work, saa6588_work
, s
);
+ INIT_WORK(&s->work, saa6588_work);
init_timer(&s->timer);
s->timer.function = saa6588_timer;
s->timer.data = (unsigned long)s;
init_timer(&s->timer);
s->timer.function = saa6588_timer;
s->timer.data = (unsigned long)s;