Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228204
b: refs/heads/master
c: 7c9eb69
h: refs/heads/master
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Nov 29, 2010
1 parent 53d7666 commit ef959c3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: da14e55130785db243a98523b57ddf56d6c6320a
refs/heads/master: 7c9eb69123a634c8551e8887bda03c2e549da233
8 changes: 1 addition & 7 deletions trunk/drivers/staging/sep/sep_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit ef959c3

Please sign in to comment.