diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-10-20 00:26:44 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-10-20 00:26:44 -0400 |
| commit | 748c5151deb56e4b7b5a9b07a884243764933831 (patch) | |
| tree | e9dd45b8806d00b56503cfa55c46f3ebce0d151c /drivers/media/video/saa5249.c | |
| parent | 4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff) | |
| parent | e8b8c977734193adedf2b0f607d6252c78e86394 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/media/video/saa5249.c')
| -rw-r--r-- | drivers/media/video/saa5249.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c index 17f1e2e9a66..94bb59a32b1 100644 --- a/drivers/media/video/saa5249.c +++ b/drivers/media/video/saa5249.c | |||
| @@ -291,10 +291,10 @@ static int i2c_senddata(struct saa5249_device *t, ...) | |||
| 291 | return i2c_sendbuf(t, buf[0], ct-1, buf+1); | 291 | return i2c_sendbuf(t, buf[0], ct-1, buf+1); |
| 292 | } | 292 | } |
| 293 | 293 | ||
| 294 | /* Get count number of bytes from I²C-device at address adr, store them in buf. Start & stop | 294 | /* Get count number of bytes from I²C-device at address adr, store them in buf. Start & stop |
| 295 | * handshaking is done by this routine, ack will be sent after the last byte to inhibit further | 295 | * handshaking is done by this routine, ack will be sent after the last byte to inhibit further |
| 296 | * sending of data. If uaccess is 'true', data is written to user-space with put_user. | 296 | * sending of data. If uaccess is 'true', data is written to user-space with put_user. |
| 297 | * Returns -1 if I²C-device didn't send acknowledge, 0 otherwise | 297 | * Returns -1 if I²C-device didn't send acknowledge, 0 otherwise |
| 298 | */ | 298 | */ |
| 299 | 299 | ||
| 300 | static int i2c_getdata(struct saa5249_device *t, int count, u8 *buf) | 300 | static int i2c_getdata(struct saa5249_device *t, int count, u8 *buf) |