Commit 34c27a49 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block 

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  staging: Fix bdops->check_events() misconversion in cyasblkdev_block.c
  ide: ensure that we re-run the queue handler
parents 8d49a775 0b58b4e3

drivers/ide/ide-io.c

+11 −1
Original line number Diff line number Diff line
@@ -440,6 +440,7 @@ void do_ide_request(struct request_queue *q) 
	struct ide_host *host = hwif->host;

	struct request	*rq = NULL;

	ide_startstop_t	startstop;

	unsigned long queue_run_ms = 3; /* old plug delay */



	spin_unlock_irq(q->queue_lock);
@@ -459,6 +460,9 @@ void do_ide_request(struct request_queue *q) 
		prev_port = hwif->host->cur_port;

		if (drive->dev_flags & IDE_DFLAG_SLEEPING &&

		    time_after(drive->sleep, jiffies)) {

			unsigned long left = jiffies - drive->sleep;



			queue_run_ms = jiffies_to_msecs(left + 1);

			ide_unlock_port(hwif);

			goto plug_device;

		}
@@ -547,8 +551,10 @@ void do_ide_request(struct request_queue *q) 
plug_device_2:

	spin_lock_irq(q->queue_lock);



	if (rq)

	if (rq) {

		blk_requeue_request(q, rq);

		blk_delay_queue(q, queue_run_ms);

	}

}



void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq)
@@ -562,6 +568,10 @@ void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq) 
		blk_requeue_request(q, rq);



	spin_unlock_irqrestore(q->queue_lock, flags);



	/* Use 3ms as that was the old plug delay */

	if (rq)

		blk_delay_queue(q, 3);

}



static int drive_is_ready(ide_drive_t *drive)

drivers/staging/westbridge/astoria/block/cyasblkdev_block.c

+1 −1
Original line number Diff line number Diff line
@@ -1191,7 +1191,7 @@ static int cyasblkdev_add_disks(int bus_num, 
		bd->user_disk_1->first_minor = (devidx + 1) << CYASBLKDEV_SHIFT;

		bd->user_disk_1->minors = 8;

		bd->user_disk_1->fops = &cyasblkdev_bdops;

		bd->user_disk_0->events = DISK_EVENT_MEDIA_CHANGE;

		bd->user_disk_1->events = DISK_EVENT_MEDIA_CHANGE;

		bd->user_disk_1->private_data = bd;

		bd->user_disk_1->queue = bd->queue.queue;

		bd->dbgprn_flags = DBGPRN_RD_RQ;