Merge master.kernel.org:/home/rmk/linux-2.6-mmc (a2c78f7c) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/mmc/mmc_block.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

+8 −7

Original line number	Diff line number	Diff line
		@@ -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! "