Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block

[firefly-linux-kernel-4.4.55.git] / drivers / staging / zram / zram_drv.c

diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index b9926ee0052c37bc5d6f68cada276f010ea6bad9..09de99fbb7e0e5e5874b2d5f662ad6b51408e8c3 100644 (file)
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -556,7 +556,7 @@ static inline int valid_io_request(struct zram *zram, struct bio *bio)
 /*
  * Handler function for all zram I/O requests.
  */
-static int zram_make_request(struct request_queue *queue, struct bio *bio)
+static void zram_make_request(struct request_queue *queue, struct bio *bio)
 {
        struct zram *zram = queue->queuedata;
 
@@ -575,13 +575,12 @@ static int zram_make_request(struct request_queue *queue, struct bio *bio)
        __zram_make_request(zram, bio, bio_data_dir(bio));
        up_read(&zram->init_lock);
 
-       return 0;
+       return;
 
 error_unlock:
        up_read(&zram->init_lock);
 error:
        bio_io_error(bio);
-       return 0;
 }
 
 void __zram_reset_device(struct zram *zram)