diff options
| author | Rashika Kheria <rashika.kheria@gmail.com> | 2013-10-30 18:43:32 +0530 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-05-11 17:36:31 +0800 |
| commit | 922959916229ecc5f143b0fe66a9a8bbf4b55169 (patch) | |
| tree | 1fd0bd2849717bbe5054e028c26d263fe9c13589 /drivers | |
| parent | e2671233fa7df020b7ea720db33f1237c418f3ab (diff) | |
Staging: zram: Fix variable dereferenced before check
This patch fixes the following Smatch warning in zram_drv.c-
drivers/staging/zram/zram_drv.c:899
destroy_device() warn: variable dereferenced before check 'zram->disk' (see line 896)
Acked-by: Minchan Kim <minchan@kernel.org>
Acked-by: Jerome Marchand <jmarchan@redhat.com>
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 59d3fe540454dd8fc48d4eda44e200f9c98bef10)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/zram/zram_drv.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c index 7d8ff31f67f2..a125cfae6942 100644 --- a/drivers/staging/zram/zram_drv.c +++ b/drivers/staging/zram/zram_drv.c @@ -896,13 +896,10 @@ static void destroy_device(struct zram *zram) sysfs_remove_group(&disk_to_dev(zram->disk)->kobj, &zram_disk_attr_group); - if (zram->disk) { - del_gendisk(zram->disk); - put_disk(zram->disk); - } + del_gendisk(zram->disk); + put_disk(zram->disk); - if (zram->queue) - blk_cleanup_queue(zram->queue); + blk_cleanup_queue(zram->queue); } static int __init zram_init(void) |