diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2013-10-07 21:08:22 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2013-10-07 21:08:22 +0000 |
| commit | 5988e60edb3659c106575bf6b3029a8247e0dee7 (patch) | |
| tree | 4e9ab9f1caf78cdaf3fc612d1aa93b3ff15c2396 /camlibs/canon | |
| parent | 205633c8e5b24bb45d14dba19c737addec624807 (diff) | |
| download | libgphoto2-5988e60edb3659c106575bf6b3029a8247e0dee7.tar.gz | |
replace && by ||,
found by Jaromír Končický via Coverity
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14557 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/canon')
| -rw-r--r-- | camlibs/canon/canon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c index e46277fd9..872c15a3c 100644 --- a/camlibs/canon/canon.c +++ b/camlibs/canon/canon.c @@ -2074,7 +2074,7 @@ canon_int_get_zoom (Camera *camera, msg = canon_usb_dialogue ( camera, CANON_USB_FUNCTION_CONTROL_CAMERA, &datalen, payload, payloadlen ); - if ( msg == NULL && datalen != 0x1c) { + if ( msg == NULL || datalen != 0x1c) { /* ERROR */ GP_DEBUG ("%s datalen=%x", desc, datalen); |