aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorRashika Kheria <rashika.kheria@gmail.com>2013-10-30 18:43:32 +0530
committerSimon Shields <keepcalm444@gmail.com>2016-06-12 21:19:50 +1000
commitbae6d9d2927a7bc7f0531c5d55f411cabc5f57cc (patch)
tree373660de086045fc6d23e727f4a3e6630e9faf33 /drivers/staging
parenta491dd7878acecaf69e94131f2834afd72e64f19 (diff)
downloadkernel_samsung_smdk4412-bae6d9d2927a7bc7f0531c5d55f411cabc5f57cc.zip
kernel_samsung_smdk4412-bae6d9d2927a7bc7f0531c5d55f411cabc5f57cc.tar.gz
kernel_samsung_smdk4412-bae6d9d2927a7bc7f0531c5d55f411cabc5f57cc.tar.bz2
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')
-rw-r--r--drivers/staging/zram/zram_drv.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index 91fe3a1..06f217e 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -909,13 +909,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)