shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-11-01 00:51:08 +03:00
Code

scsi_id: the fallback fix broke error handling

Browse Source
This commit is contained in:
Kay Sievers 2008-07-10 22:22:10 +02:00
parent 52b375bc3b
commit 05364975af
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras/scsi_id/scsi_id.c
View File

@ -551,7 +551,7 @@ static int set_inq_values(struct scsi_id_device *dev_scsi, const char *path)
retval = scsi_std_inquiry(dev_scsi, path);
if (retval)
return retval;
return retval;
set_str(vendor_str, dev_scsi->vendor, sizeof(vendor_str));
set_str(model_str, dev_scsi->model, sizeof(model_str));

5
extras/scsi_id/scsi_serial.c
View File

@ -351,13 +351,13 @@ resend:
io_buf = (void *)&io_hdr;
}
if (ioctl(fd, SG_IO, io_buf) < 0) {
retval = ioctl(fd, SG_IO, io_buf);
if (retval < 0) {
if ((errno == EINVAL || errno == ENOSYS) && dev_scsi->use_sg == 4) {
dev_scsi->use_sg = 3;
goto resend;
}
info("%s: ioctl failed: %s\n", dev_scsi->kernel, strerror(errno));
retval = -1;
goto error;
}
@ -806,6 +806,7 @@ int scsi_std_inquiry(struct scsi_id_device *dev_scsi, const char *devname)
if (err < 0)
goto out;
err = 0;
memcpy(dev_scsi->vendor, buf + 8, 8);
dev_scsi->vendor[8] = '\0';
memcpy(dev_scsi->model, buf + 16, 16);