diff options
Diffstat (limited to 'drivers/scsi/ips.c')
-rw-r--r-- | drivers/scsi/ips.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 68e5b2ab27c4..cd9b95db5a7d 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c | |||
@@ -4517,10 +4517,8 @@ ips_free(ips_ha_t * ha) | |||
4517 | ha->enq = NULL; | 4517 | ha->enq = NULL; |
4518 | } | 4518 | } |
4519 | 4519 | ||
4520 | if (ha->conf) { | 4520 | kfree(ha->conf); |
4521 | kfree(ha->conf); | 4521 | ha->conf = NULL; |
4522 | ha->conf = NULL; | ||
4523 | } | ||
4524 | 4522 | ||
4525 | if (ha->adapt) { | 4523 | if (ha->adapt) { |
4526 | pci_free_consistent(ha->pcidev, | 4524 | pci_free_consistent(ha->pcidev, |
@@ -4538,15 +4536,11 @@ ips_free(ips_ha_t * ha) | |||
4538 | ha->logical_drive_info = NULL; | 4536 | ha->logical_drive_info = NULL; |
4539 | } | 4537 | } |
4540 | 4538 | ||
4541 | if (ha->nvram) { | 4539 | kfree(ha->nvram); |
4542 | kfree(ha->nvram); | 4540 | ha->nvram = NULL; |
4543 | ha->nvram = NULL; | ||
4544 | } | ||
4545 | 4541 | ||
4546 | if (ha->subsys) { | 4542 | kfree(ha->subsys); |
4547 | kfree(ha->subsys); | 4543 | ha->subsys = NULL; |
4548 | ha->subsys = NULL; | ||
4549 | } | ||
4550 | 4544 | ||
4551 | if (ha->ioctl_data) { | 4545 | if (ha->ioctl_data) { |
4552 | pci_free_consistent(ha->pcidev, ha->ioctl_len, | 4546 | pci_free_consistent(ha->pcidev, ha->ioctl_len, |