Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756521Ab3J1MRY (ORCPT ); Mon, 28 Oct 2013 08:17:24 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:37313 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756504Ab3J1MRW (ORCPT ); Mon, 28 Oct 2013 08:17:22 -0400 From: Rashika Kheria To: opw-kernel@googlegroups.com, Greg Kroah-Hartman , Minchan Kim , Jiang Liu , Nitin Gupta , Jerome Marchand , linux-kernel@vger.kernel.org Subject: [PATCH v5 2/3] Staging: zram: Fix variable dereferenced before check Date: Mon, 28 Oct 2013 17:47:11 +0530 Message-Id: <01cafd6f9a98d41c243ae507ae731edc5cca045a.1382959029.git.rashika.kheria@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <20131019110539.GA25167@gmail.com> References: <20131019110539.GA25167@gmail.com> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1315 Lines: 42 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) Signed-off-by: Rashika Kheria --- This revision fixes the following issues of the previous revision- Seperating patches into Bug fix and Smatch fix drivers/staging/zram/zram_drv.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c index d640a8f..9027975 100644 --- a/drivers/staging/zram/zram_drv.c +++ b/drivers/staging/zram/zram_drv.c @@ -898,13 +898,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) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/