hal/hald/linux/volume_id volume_id.c,1.31,1.32

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux/volume_id
In directory gabe:/tmp/cvs-serv28588/hald/linux/volume_id

Modified Files:
	volume_id.c 
Log Message:
2004-09-14  David Zeuthen  <david at fubar.dk>

	* hald/linux/block_class_device.c (cdrom_get_properties): Also set
	storage.cdrom.dvdrw to FALSE. Add note about we should be giving 
	the SCSI ioctl stuff some love soon.

	* hald/linux/volume_id/volume_id.c (probe_vfat): Don't le16_to_cpu
	for vs->sectors_per_cluster - it's a 8-bit quantity. Fixes bug with
	one of my FAT32 volume labels



Index: volume_id.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/volume_id/volume_id.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- volume_id.c	13 Sep 2004 15:11:42 -0000	1.31
+++ volume_id.c	14 Sep 2004 12:08:40 -0000	1.32
@@ -947,7 +947,7 @@
 		__u64 fat_entry_off;
 
 		dbg("next cluster %u", next);
-		next_sect_off = (next - 2) * le16_to_cpu(vs->sectors_per_cluster);
+		next_sect_off = (next - 2) * vs->sectors_per_cluster;
 		next_off = (start_data_sect + next_sect_off) * sector_size;
 		dbg("cluster offset 0x%x", next_off);