chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
path_id: fix fibre channel handling
[elogind.git]
/
extras
/
scsi_id
/
scsi_serial.c
diff --git
a/extras/scsi_id/scsi_serial.c
b/extras/scsi_id/scsi_serial.c
index 757f41d14e2e30ab5ff43d3c2015160452d79247..20d30cf0df64f8398392cf38271aeb79924e0782 100644
(file)
--- a/
extras/scsi_id/scsi_serial.c
+++ b/
extras/scsi_id/scsi_serial.c
@@
-156,7
+156,7
@@
static int sg_err_category4(struct udev *udev, struct sg_io_v4 *hp)
{
return sg_err_category_new(udev, hp->device_status, 0,
hp->transport_status, hp->driver_status,
{
return sg_err_category_new(udev, hp->device_status, 0,
hp->transport_status, hp->driver_status,
- (unsigned char *)hp->response,
+ (unsigned char *)
(uintptr_t)
hp->response,
hp->response_len);
}
hp->response_len);
}
@@
-300,7
+300,7
@@
static int scsi_dump_v4(struct udev *udev,
dev_scsi->kernel, io->driver_status, io->transport_status,
io->device_status);
if (io->device_status == SCSI_CHECK_CONDITION)
dev_scsi->kernel, io->driver_status, io->transport_status,
io->device_status);
if (io->device_status == SCSI_CHECK_CONDITION)
- return scsi_dump_sense(udev, dev_scsi, (unsigned char *)io->response,
+ return scsi_dump_sense(udev, dev_scsi, (unsigned char *)
(uintptr_t)
io->response,
io->response_len);
else
return -1;
io->response_len);
else
return -1;