Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4e321b8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

parents f8872f4c dd2c609c

drivers/mmc/mmc_queue.c

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ static int mmc_queue_thread(void *d) 
		spin_lock_irq(q->queue_lock);

		set_current_state(TASK_INTERRUPTIBLE);

		if (!blk_queue_plugged(q))

			mq->req = req = elv_next_request(q);

			req = elv_next_request(q);

		mq->req = req;

		spin_unlock_irq(q->queue_lock);



		if (!req) {

drivers/mmc/wbsd.c

+5 −4
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include "wbsd.h"



#define DRIVER_NAME "wbsd"

#define DRIVER_VERSION "1.5"

#define DRIVER_VERSION "1.6"



#define DBG(x...) \

	pr_debug(DRIVER_NAME ": " x)
@@ -1439,13 +1439,13 @@ static int __devinit wbsd_scan(struct wbsd_host *host) 


static int __devinit wbsd_request_region(struct wbsd_host *host, int base)

{

	if (io & 0x7)

	if (base & 0x7)

		return -EINVAL;



	if (!request_region(base, 8, DRIVER_NAME))

		return -EIO;



	host->base = io;

	host->base = base;



	return 0;

}
@@ -1773,7 +1773,7 @@ static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma, 
	/*

	 * Request resources.

	 */

	ret = wbsd_request_resources(host, io, irq, dma);

	ret = wbsd_request_resources(host, base, irq, dma);

	if (ret) {

		wbsd_release_resources(host);

		wbsd_free_mmc(dev);
@@ -1861,6 +1861,7 @@ static void __devexit wbsd_shutdown(struct device *dev, int pnp) 


static int __devinit wbsd_probe(struct platform_device *dev)

{

	/* Use the module parameters for resources */

	return wbsd_init(&dev->dev, io, irq, dma, 0);

}