git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
[pandora-kernel.git]
/
drivers
/
block
/
umem.c
diff --git
a/drivers/block/umem.c
b/drivers/block/umem.c
index
031ca72
..
aa27120
100644
(file)
--- a/
drivers/block/umem.c
+++ b/
drivers/block/umem.c
@@
-513,7
+513,7
@@
static void process_page(unsigned long data)
}
}
}
}
-static
int
mm_make_request(struct request_queue *q, struct bio *bio)
+static
void
mm_make_request(struct request_queue *q, struct bio *bio)
{
struct cardinfo *card = q->queuedata;
pr_debug("mm_make_request %llu %u\n",
{
struct cardinfo *card = q->queuedata;
pr_debug("mm_make_request %llu %u\n",
@@
-525,7
+525,7
@@
static int mm_make_request(struct request_queue *q, struct bio *bio)
card->biotail = &bio->bi_next;
spin_unlock_irq(&card->lock);
card->biotail = &bio->bi_next;
spin_unlock_irq(&card->lock);
- return
0
;
+ return;
}
static irqreturn_t mm_interrupt(int irq, void *__card)
}
static irqreturn_t mm_interrupt(int irq, void *__card)