git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
[pandora-kernel.git]
/
drivers
/
media
/
video
/
saa7164
/
saa7164-buffer.c
diff --git
a/drivers/media/video/saa7164/saa7164-buffer.c
b/drivers/media/video/saa7164/saa7164-buffer.c
index
5713f3a
..
ddd25d3
100644
(file)
--- a/
drivers/media/video/saa7164/saa7164-buffer.c
+++ b/
drivers/media/video/saa7164/saa7164-buffer.c
@@
-136,10
+136,11
@@
ret:
int saa7164_buffer_dealloc(struct saa7164_tsport *port,
struct saa7164_buffer *buf)
{
int saa7164_buffer_dealloc(struct saa7164_tsport *port,
struct saa7164_buffer *buf)
{
- struct saa7164_dev *dev
= port->dev
;
+ struct saa7164_dev *dev;
- if (
(buf == 0) || (port == 0)
)
+ if (
!buf || !port
)
return SAA_ERR_BAD_PARAMETER;
return SAA_ERR_BAD_PARAMETER;
+ dev = port->dev;
dprintk(DBGLVL_BUF, "%s() deallocating buffer @ 0x%p\n", __func__, buf);
dprintk(DBGLVL_BUF, "%s() deallocating buffer @ 0x%p\n", __func__, buf);