Skip to content

Commit

Permalink
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Browse files Browse the repository at this point in the history
  • Loading branch information
Linus Torvalds committed Nov 5, 2005
2 parents 6037d6b + d191634 commit a2c78f7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
1 change: 0 additions & 1 deletion drivers/mmc/mmc_block.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
15 changes: 8 additions & 7 deletions drivers/mmc/wbsd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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! "
Expand Down

0 comments on commit a2c78f7

Please sign in to comment.