diff options
| author | Rashika Kheria <rashika.kheria@gmail.com> | 2013-10-30 18:43:32 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-30 09:32:10 -0700 |
| commit | 59d3fe540454dd8fc48d4eda44e200f9c98bef10 (patch) | |
| tree | d30d65677f0f645c0b961e753d42241e29b1f3e0 /drivers/staging/zram | |
| parent | 238822bc917be7d0d86101b5953704da89307067 (diff) | |
| download | blackbird-obmc-linux-59d3fe540454dd8fc48d4eda44e200f9c98bef10.tar.gz blackbird-obmc-linux-59d3fe540454dd8fc48d4eda44e200f9c98bef10.zip | |
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>
Diffstat (limited to 'drivers/staging/zram')
| -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 2c4ed52ca849..b704d06943f5 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) |
