diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2013-04-13 09:13:46 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2013-04-13 09:13:46 +0000 |
| commit | ab45921ea841e7800dc48a9c9d4ae7fe28409fe1 (patch) | |
| tree | 235231c519ccd9032668cfcea813dde7d39da83d /libgphoto2_port/usbscsi | |
| parent | fcff6f915ab124c1191e6d57887a6141c205465f (diff) | |
| download | libgphoto2-ab45921ea841e7800dc48a9c9d4ae7fe28409fe1.tar.gz | |
use the port timeout, not the fixed 1.5 seconds
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14340 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2_port/usbscsi')
| -rw-r--r-- | libgphoto2_port/usbscsi/linux.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libgphoto2_port/usbscsi/linux.c b/libgphoto2_port/usbscsi/linux.c index 195707330..80223bc76 100644 --- a/libgphoto2_port/usbscsi/linux.c +++ b/libgphoto2_port/usbscsi/linux.c @@ -324,7 +324,11 @@ static int gp_port_usbscsi_send_scsi_cmd (GPPort *port, int to_dev, char *cmd, io_hdr.mx_sb_len = sense_size; io_hdr.dxferp = (unsigned char *)data; io_hdr.dxfer_len = data_size; - io_hdr.timeout = 1500; + /*io_hdr.timeout = 1500;*/ + io_hdr.timeout = port->timeout; + gp_log (GP_LOG_DEBUG, "port/usbscsi", "setting scsi command timeout to %d", port->timeout); + if (io_hdr.timeout < 1500) + io_hdr.timeout = 1500; if (ioctl (port->pl->fd, SG_IO, &io_hdr) < 0) { |