summaryrefslogtreecommitdiff
path: root/extras/scsi_id/scsi_id.c
diff options
context:
space:
mode:
authorpatmans@us.ibm.com <patmans@us.ibm.com>2004-10-15 23:04:44 -0700
committerGreg KH <gregkh@suse.de>2005-04-26 22:02:45 -0700
commitb337e60790382589e8e9f088f0ff41a496a85615 (patch)
tree4172636f0b9cf848d1039e77ed992faf33826c6f /extras/scsi_id/scsi_id.c
parenta8f2703adaf21620bb92c04d3b8371f228cd11d2 (diff)
[PATCH] update udev to scsi_id 0.7
Update udev's scsi_id to version 0.7, this fixes a bad bug in scsi_id on 64 bit systems.
Diffstat (limited to 'extras/scsi_id/scsi_id.c')
-rw-r--r--extras/scsi_id/scsi_id.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index 6395b822ce..d2155e6866 100644
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -713,7 +713,8 @@ static int scsi_id(const char *target_path, char *maj_min_dev)
#define ALIGN 512
unaligned_buf = malloc(MAX_SERIAL_LEN + ALIGN);
- serial = (char*) (((int) unaligned_buf + (ALIGN - 1)) & ~(ALIGN - 1));
+ serial = (char*) (((unsigned long) unaligned_buf + (ALIGN - 1))
+ & ~(ALIGN - 1));
dprintf("buffer unaligned 0x%p; aligned 0x%p\n", unaligned_buf, serial);
#undef ALIGN