diff options
| author | nadlabak <pavel@doshaska.net> | 2015-04-03 17:56:34 +0200 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-06-12 21:19:38 +1000 |
| commit | f27ad129993f7a8d9447b0be4214fd09096144a4 (patch) | |
| tree | 5ef7712c5770a47cd26b478bfa422661888f1aa2 /drivers/staging | |
| parent | 67a88accdee63629afb4c0645870ac07e38fec28 (diff) | |
| download | kernel_samsung_smdk4412-f27ad129993f7a8d9447b0be4214fd09096144a4.tar.gz kernel_samsung_smdk4412-f27ad129993f7a8d9447b0be4214fd09096144a4.tar.bz2 kernel_samsung_smdk4412-f27ad129993f7a8d9447b0be4214fd09096144a4.zip | |
staging: zram: Fix zram_make_request type for 3.0 kernel
Change-Id: I7a63948ff64e3d2a2279550ad47f61443a77528d
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/zram/zram_drv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c index e34e3fe0ae2..62f2db60620 100644 --- a/drivers/staging/zram/zram_drv.c +++ b/drivers/staging/zram/zram_drv.c @@ -437,7 +437,7 @@ static inline int valid_io_request(struct zram *zram, struct bio *bio) /* * Handler function for all zram I/O requests. */ -static void zram_make_request(struct request_queue *queue, struct bio *bio) +static int zram_make_request(struct request_queue *queue, struct bio *bio) { struct zram *zram = queue->queuedata; @@ -453,11 +453,13 @@ static void 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; + return 0; error: up_read(&zram->init_lock); bio_io_error(bio); + + return 0; } static void __zram_reset_device(struct zram *zram) |