Merge master.kernel.org:/home/rmk/linux-2.6-mmc

2 files changed, 8 insertions, 8 deletions

diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
index 9b629856c735..d91fcf7c3178 100644
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/mmc_block.c
@@ -203,7 +203,6 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
                         brq.data.flags |= MMC_DATA_READ;
                 } else {
                         brq.cmd.opcode = MMC_WRITE_BLOCK;
-                        brq.cmd.flags = MMC_RSP_R1B;
                         brq.data.flags |= MMC_DATA_WRITE;
                         brq.data.blocks = 1;
                 }
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index 942668e93a74..4ff67e7363d9 100644
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -201,7 +201,7 @@ static void wbsd_reset(struct wbsd_host* host)
 {
         u8 setup;
 
-        printk(KERN_ERR DRIVER_NAME ": Resetting chip\n");
+        printk(KERN_ERR "%s: Resetting chip\n", mmc_hostname(host->mmc));
 
         /*
          * Soft reset of chip (SD/MMC part).
@@ -880,8 +880,9 @@ static void wbsd_finish_data(struct wbsd_host* host, struct mmc_data* data)
                  */
                 if (count)
                 {
-                        printk(KERN_ERR DRIVER_NAME ": Incomplete DMA "
-                                "transfer. %d bytes left.\n", count);
+                        printk(KERN_ERR "%s: Incomplete DMA transfer. "
+                                "%d bytes left.\n",
+                                mmc_hostname(host->mmc), count);
 
                         data->error = MMC_ERR_FAILED;
                 }
@@ -1169,8 +1170,8 @@ static void wbsd_tasklet_card(unsigned long param)
 
                 if (host->mrq)
                 {
-                        printk(KERN_ERR DRIVER_NAME
-                                ": Card removed during transfer!\n");
+                        printk(KERN_ERR "%s: Card removed during transfer!\n",
+                                mmc_hostname(host->mmc));
                         wbsd_reset(host);
 
                         host->mrq->cmd->error = MMC_ERR_FAILED;
@@ -1852,9 +1853,9 @@ static int __devinit wbsd_init(struct device* dev, int base, int irq, int dma,
         /*
          * See if chip needs to be configured.
          */
-        if (pnp && (host->config != 0))
+        if (pnp)
         {
-                if (!wbsd_chip_validate(host))
+                if ((host->config != 0) && !wbsd_chip_validate(host))
                 {
                         printk(KERN_WARNING DRIVER_NAME
                                 ": PnP active but chip not configured! "