diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-08-19 07:00:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-09-27 22:21:49 -0300 |
| commit | 23e64d55859ea619c17832645e0e56faac84d750 (patch) | |
| tree | 38ee583149639e23e8d5dd43ff6f6f4d616ff85d /drivers/media | |
| parent | d5337966ce4639c775ff5edf92d78f5fad34ef0d (diff) | |
| download | linux-3.10-23e64d55859ea619c17832645e0e56faac84d750.tar.gz linux-3.10-23e64d55859ea619c17832645e0e56faac84d750.tar.bz2 linux-3.10-23e64d55859ea619c17832645e0e56faac84d750.zip | |
V4L/DVB: saa7164: move dereference under NULL check
The original code dereferenced "port" before checking it for NULL. I
moved the test down below the check. Also I changed the comparisons a
little so people wouldn't get confused and think "port" and "buf" were
ints instead of pointers. (Probably that's what lead to this issue in
the first place.)
There is only one caller for this function and it passes non-NULL
pointers, so this is essentially a cleanup rather than a bugfix.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/saa7164/saa7164-buffer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/saa7164/saa7164-buffer.c b/drivers/media/video/saa7164/saa7164-buffer.c index 5713f3a4b76..ddd25d32723 100644 --- 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) { - struct saa7164_dev *dev = port->dev; + struct saa7164_dev *dev; - if ((buf == 0) || (port == 0)) + if (!buf || !port) return SAA_ERR_BAD_PARAMETER; + dev = port->dev; dprintk(DBGLVL_BUF, "%s() deallocating buffer @ 0x%p\n", __func__, buf); |