From 14f6f505cee7a2cc7abc08b2114d292e01bddf93 Mon Sep 17 00:00:00 2001
From: "R. Bernstein" <rocky@gnu.org>
Date: Sun, 4 Mar 2012 14:12:09 -0500
Subject: [PATCH] Some more pbatard patches

---
 configure.ac                 |  2 +-
 lib/driver/ds.c              |  4 ++++
 lib/driver/mmc/mmc_ll_cmds.c | 13 +++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1d59375f..49144013 100644
--- a/configure.ac
+++ b/configure.ac
@@ -526,7 +526,7 @@ if test "x${enable_joliet}" != "xno"; then
   if test "x$joliet_supported" = "xyes"; then 
      AC_DEFINE(HAVE_JOLIET, [1], 
      [Define 1 if you want ISO-9660 Joliet extension support. 
-     On most platform, this requires libiconv to be installed.])
+     On most platforms, this requires libiconv to be installed.])
      HAVE_JOLIET=1
   else
      AC_MSG_ERROR([You must have iconv installed.])
diff --git a/lib/driver/ds.c b/lib/driver/ds.c
index a062beea..74936bb8 100644
--- a/lib/driver/ds.c
+++ b/lib/driver/ds.c
@@ -21,8 +21,12 @@
 # define __CDIO_CONFIG_H__ 1
 #endif
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 
 #include <cdio/ds.h>
 #include <cdio/util.h>
diff --git a/lib/driver/mmc/mmc_ll_cmds.c b/lib/driver/mmc/mmc_ll_cmds.c
index 7a92ea61..e94dcd86 100644
--- a/lib/driver/mmc/mmc_ll_cmds.c
+++ b/lib/driver/mmc/mmc_ll_cmds.c
@@ -297,11 +297,11 @@ mmc_read_cd(const CdIo_t *p_cdio, void *p_buf1, lsn_t i_lsn,
     uint8_t cdb9 = 0;
     const unsigned int i_timeout = mmc_timeout_ms * (MAX_CD_READ_BLOCKS/2);
 
+    MMC_CMD_SETUP(CDIO_MMC_GPCMD_READ_CD);
+
     /* Catch what may be a common bug. */
     if (NULL == p_buf) return DRIVER_OP_BAD_POINTER;
 
-    MMC_CMD_SETUP(CDIO_MMC_GPCMD_READ_CD);
-    
     CDIO_MMC_SET_READ_TYPE(cdb.field, read_sector_type);
     if (b_digital_audio_play) cdb.field[1] |= 0x2;
     
@@ -397,10 +397,10 @@ mmc_set_speed(const CdIo_t *p_cdio, int i_Kbs_speed, unsigned int i_timeout_ms)
     uint8_t buf[14] = { 0, };
     void * p_buf = &buf;
     const unsigned int i_size = sizeof(buf);
-    if (0 == i_timeout_ms) i_timeout_ms = mmc_timeout_ms;
-    
     MMC_CMD_SETUP(CDIO_MMC_GPCMD_SET_SPEED);
-    
+
+    if (0 == i_timeout_ms) i_timeout_ms = mmc_timeout_ms;
+
     /* If the requested speed is less than 1x 176 kb/s this command
        will return an error - it's part of the ATAPI specs. Therefore, 
        test and stop early. */
@@ -464,7 +464,8 @@ mmc_test_unit_ready(const CdIo_t *p_cdio, unsigned int i_timeout_ms)
 {
     const unsigned int i_size = 0;
     void  * p_buf = NULL;
-    if (0 == i_timeout_ms) i_timeout_ms = mmc_timeout_ms;
     MMC_CMD_SETUP_READ16(CDIO_MMC_GPCMD_TEST_UNIT_READY);
+
+    if (0 == i_timeout_ms) i_timeout_ms = mmc_timeout_ms;
     return MMC_RUN_CMD(SCSI_MMC_DATA_NONE, i_timeout_ms);
 }