V4L/DVB (12685): dvb-core: check fe->ops.set_frontend return value

[~andy/linux] / drivers / block / osdblk.c

diff --git a/drivers/block/osdblk.c b/drivers/block/osdblk.c
index 3565d0dd123fab380298cece5dab9c2262842243..13c1aee6aa3f47f2f1cc847452257ac88443a958 100644 (file)
--- a/drivers/block/osdblk.c
+++ b/drivers/block/osdblk.c
@@ -66,6 +66,7 @@
 #include <scsi/osd_initiator.h>
 #include <scsi/osd_attributes.h>
 #include <scsi/osd_sec.h>
+#include <scsi/scsi_device.h>
 
 #define DRV_NAME "osdblk"
 #define PFX DRV_NAME ": "
@@ -437,6 +438,12 @@ static int osdblk_init_disk(struct osdblk_device *osdev)
                return rc;
        }
 
+       /* Set our limits to the lower device limits, because osdblk cannot
+        * sleep when allocating a lower-request and therefore cannot be
+        * bouncing.
+        */
+       blk_queue_stack_limits(q, osd_request_queue(osdev->osd));
+
        blk_queue_prep_rq(q, blk_queue_start_tag);
        blk_queue_ordered(q, QUEUE_ORDERED_DRAIN_FLUSH, osdblk_prepare_flush);