diff options
| author | nadlabak <pavel@doshaska.net> | 2015-04-03 17:56:34 +0200 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-01-05 18:21:06 +0100 |
| commit | 0dc35793ddfdb466fdde308d9b654550af2751b1 (patch) | |
| tree | 44a961ab5cf95adf2a1a5b7a4c17500c90905c5a /drivers/staging | |
| parent | 177d37f7c0b4be550b9b7cb581dcb0d86c40fbe0 (diff) | |
| download | kernel_samsung_tuna-0dc35793ddfdb466fdde308d9b654550af2751b1.zip kernel_samsung_tuna-0dc35793ddfdb466fdde308d9b654550af2751b1.tar.gz kernel_samsung_tuna-0dc35793ddfdb466fdde308d9b654550af2751b1.tar.bz2 | |
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 e34e3fe..62f2db6 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) |