Merge ../torvalds-2.6/

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index 1efc9f21229e..5ced2725d6c7 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -65,7 +65,7 @@ static void
 tapeblock_trigger_requeue(struct tape_device *device)
 {
         /* Protect against rescheduling. */
-        if (atomic_compare_and_swap(0, 1, &device->blk_data.requeue_scheduled))
+        if (atomic_cmpxchg(&device->blk_data.requeue_scheduled, 0, 1) != 0)
                 return;
         schedule_work(&device->blk_data.requeue_task);
 }
@@ -78,7 +78,7 @@ tapeblock_end_request(struct request *req, int uptodate)
 {
         if (end_that_request_first(req, uptodate, req->hard_nr_sectors))
                 BUG();
-        end_that_request_last(req);
+        end_that_request_last(req, uptodate);
 }
 
 static void