diff --git a/include/cdio/scsi_mmc.h b/include/cdio/scsi_mmc.h
index 7a777644..c260dc92 100644
--- a/include/cdio/scsi_mmc.h
+++ b/include/cdio/scsi_mmc.h
@@ -1,5 +1,5 @@
 /*
-    $Id: scsi_mmc.h,v 1.27 2004/08/06 22:08:07 rocky Exp $
+    $Id: scsi_mmc.h,v 1.28 2004/08/06 22:13:14 rocky Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -195,10 +195,10 @@ typedef struct scsi_mmc_cdb {
 } scsi_mmc_cdb_t;
 
 typedef struct scsi_mmc_feature_list_header {
-  unsigned char lenght_msb;
-  unsigned char lenght_1sb;
-  unsigned char lenght_2sb;
-  unsigned char lenght_lsb;
+  unsigned char length_msb;
+  unsigned char length_1sb;
+  unsigned char length_2sb;
+  unsigned char length_lsb;
   unsigned char reserved1;
   unsigned char reserved2;
   unsigned char profile_msb;
@@ -317,7 +317,7 @@ discmode_t scsi_mmc_get_dvd_struct_physical ( const CdIo *p_cdio,
   False is returned if we had an error getting the information.
 */
 bool scsi_mmc_get_hwinfo ( const CdIo *p_cdio, 
-			   /* out*/ scsi_mmc_hwinfo_t *hw_info );
+			   /* out*/ scsi_mmc_hwinfo_t *p_hw_info );
 
 
 /*!
diff --git a/lib/scsi_mmc.c b/lib/scsi_mmc.c
index dd71accf..50b4305d 100644
--- a/lib/scsi_mmc.c
+++ b/lib/scsi_mmc.c
@@ -1,6 +1,6 @@
 /*  Common SCSI Multimedia Command (MMC) routines.
 
-    $Id: scsi_mmc.c,v 1.21 2004/08/05 03:49:37 rocky Exp $
+    $Id: scsi_mmc.c,v 1.22 2004/08/06 22:13:14 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -265,7 +265,7 @@ scsi_mmc_get_drive_cap_private (const void *p_env,
 			       sizeof(buf), &buf);
   if (0 == i_status) {
     uint8_t *p;
-    int lenData  = ((unsigned int)buf[0] << 8) + buf[1];
+    uint16_t lenData  = (unsigned int) CDIO_MMC_GET_LEN16(buf);
     uint8_t *pMax = buf + 256;
 
     *p_read_cap  = 0;