diff options
author | Marcus Meissner <marcus@jet.franken.de> | 2008-12-03 08:20:41 +0000 |
---|---|---|
committer | Marcus Meissner <marcus@jet.franken.de> | 2008-12-03 08:20:41 +0000 |
commit | ebbc97c868a96f3faf1eaf78e3d4b3d59953d7a4 (patch) | |
tree | eab9df77b61beee579b40cb46e21338d2b1ac8dd /camlibs/ricoh | |
parent | 8fe4057f1282945e63e668d08add9203a305f1fe (diff) | |
download | libgphoto2-ebbc97c868a96f3faf1eaf78e3d4b3d59953d7a4.tar.gz |
hmm, left over patch ...
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@11604 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/ricoh')
-rw-r--r-- | camlibs/ricoh/ricoh.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/camlibs/ricoh/ricoh.c b/camlibs/ricoh/ricoh.c index 576c9dcbf..2f6a37630 100644 --- a/camlibs/ricoh/ricoh.c +++ b/camlibs/ricoh/ricoh.c @@ -317,6 +317,12 @@ ricoh_transmit (Camera *camera, GPContext *context, unsigned char cmd, (ret_data[1] == 0x00)) break; + /* Check if the camera reported success, 2nd version. */ + if ((*ret_len == 3) && (ret_data[0] == 0x00) && + (ret_data[1] == 0x06) && + (ret_data[2] == 0xff)) + break; + /* If camera is busy, try again (but at most 4 times). */ if ((*ret_len == 3) && (ret_data[0] == 0x00) && (ret_data[1] == 0x04) && |