diff --git a/[refs] b/[refs]
index f8b462253b31..c9f8b5b161cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c5820c743479285ce2678fd3c12b1fd39fe998f
+refs/heads/master: b8a9ae779f2c7049071034661e09cb7e1e82250c
diff --git a/trunk/block/blk-sysfs.c b/trunk/block/blk-sysfs.c
index d3aa2aadb3e0..b78c9c3e2670 100644
--- a/trunk/block/blk-sysfs.c
+++ b/trunk/block/blk-sysfs.c
@@ -40,7 +40,12 @@ queue_requests_store(struct request_queue *q, const char *page, size_t count)
 {
 	struct request_list *rl = &q->rq;
 	unsigned long nr;
-	int ret = queue_var_store(&nr, page, count);
+	int ret;
+
+	if (!q->request_fn)
+		return -EINVAL;
+
+	ret = queue_var_store(&nr, page, count);
 	if (nr < BLKDEV_MIN_RQ)
 		nr = BLKDEV_MIN_RQ;