Reduce timeout back to 1 sec.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2925 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
@@ -441,16 +441,13 @@ camera_init (Camera *camera)
|
||||
|
||||
/* Check if the camera is really there */
|
||||
CHECK_RESULT (gp_port_get_settings (camera->port, &settings));
|
||||
CHECK_RESULT (gp_port_set_timeout (camera->port, 2000));
|
||||
CHECK_RESULT (gp_port_set_timeout (camera->port, 1000));
|
||||
for (i = 0; i < 4; i++) {
|
||||
settings.serial.speed = speeds[i];
|
||||
CHECK_RESULT (gp_port_set_settings (camera->port, settings));
|
||||
result = pdc700_init (camera);
|
||||
if (result == GP_OK)
|
||||
break;
|
||||
result = pdc700_init (camera);
|
||||
if (result == GP_OK)
|
||||
break;
|
||||
}
|
||||
if (i == 4)
|
||||
return (result);
|
||||
|
||||
Reference in New Issue
Block a user