block: don't set bounce limit in blk_init_queue

[karo-tx-linux.git] / drivers / block / paride / pd.c

diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 7d2402f9097892332a43ba632c88084f52b53efa..27a44b97393af0b63bf98c17dc98a6ea213761c1 100644 (file)
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -438,7 +438,7 @@ static void run_fsm(void)
                                phase = NULL;
                                spin_lock_irqsave(&pd_lock, saved_flags);
                                if (!__blk_end_request_cur(pd_req,
-                                               res == Ok ? 0 : -EIO)) {
+                                               res == Ok ? 0 : BLK_STS_IOERR)) {
                                        if (!set_next_request())
                                                stop = 1;
                                }
@@ -863,6 +863,7 @@ static void pd_probe_drive(struct pd_unit *disk)
                return;
        }
        blk_queue_max_hw_sectors(p->queue, cluster);
+       blk_queue_bounce_limit(p->queue, BLK_BOUNCE_HIGH);
 
        if (disk->drive == -1) {
                for (disk->drive = 0; disk->drive <= 1; disk->drive++)