diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:20:26 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:20:26 -0500 |
| commit | c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83 (patch) | |
| tree | 1185ddc2c4cea1c4da09d6b83893f91aefe7cd3d /drivers/media/video/v4l1-compat.c | |
| parent | 8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 (diff) | |
| parent | 8e8b77dd4846b73f2e0756cf59123ee709246d11 (diff) | |
| download | kernel-crypto-c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83.tar.gz kernel-crypto-c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83.tar.xz kernel-crypto-c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83.zip | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/media/video/v4l1-compat.c')
| -rw-r--r-- | drivers/media/video/v4l1-compat.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c index 59bb71381a1..d679ca23ded 100644 --- a/drivers/media/video/v4l1-compat.c +++ b/drivers/media/video/v4l1-compat.c @@ -1006,10 +1006,8 @@ v4l_compat_translate_ioctl(struct inode *inode, break; } - if (cap2) - kfree(cap2); - if (fmt2) - kfree(fmt2); + kfree(cap2); + kfree(fmt2); return err; } |