summaryrefslogtreecommitdiff
path: root/drivers/staging/sep
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2010-11-24 19:38:21 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2010-11-29 11:17:28 -0800
commit7c9eb69123a634c8551e8887bda03c2e549da233 (patch)
tree226ce052a756c192258874581a2c874749a3fff6 /drivers/staging/sep
parentda14e55130785db243a98523b57ddf56d6c6320a (diff)
Staging: sep: Use kzalloc when needed
Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/sep')
-rw-r--r--drivers/staging/sep/sep_driver.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
index f576285fbb8f..ff9df36d5461 100644
--- a/drivers/staging/sep/sep_driver.c
+++ b/drivers/staging/sep/sep_driver.c
@@ -3343,16 +3343,13 @@ static int __devinit sep_probe(struct pci_dev *pdev,
}
/* allocate the sep_device structure for this device */
- sep_dev = kmalloc(sizeof(struct sep_device), GFP_ATOMIC);
+ sep_dev = kzalloc(sizeof(struct sep_device), GFP_ATOMIC);
if (sep_dev == NULL) {
dev_warn(&pdev->dev,
"can't kmalloc the sep_device structure\n");
return -ENOMEM;
}
- /* zero out sep structure */
- memset((void *)sep_dev, 0, sizeof(struct sep_device));
-
/*
* we're going to use another variable for actually
* working with the device; this way, if we have
@@ -3365,8 +3362,6 @@ static int __devinit sep_probe(struct pci_dev *pdev,
if (pdev->device == MRST_PCI_DEVICE_ID)
sep->mrst = 1;
- else
- sep->mrst = 0;
dev_dbg(&sep->pdev->dev, "PCI obtained, device being prepared\n");
dev_dbg(&sep->pdev->dev, "revision is %d\n", sep->pdev->revision);
@@ -3423,7 +3418,6 @@ static int __devinit sep_probe(struct pci_dev *pdev,
goto end_function_deallocate_sep_shared_area;
}
} else {
-
sep->rar_size = FAKE_RAR_SIZE;
sep->rar_addr = dma_alloc_coherent(NULL,
sep->rar_size, &sep->rar_bus, GFP_KERNEL);