summaryrefslogtreecommitdiff
path: root/drivers/staging/crystalhd
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2011-03-14 12:33:37 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-14 11:47:08 -0700
commita3b6ff03527247c81eab37d95b7fb36e7eda1939 (patch)
treee2b2fd7b7c8c161aa771a95bdbd20f937bfa9e02 /drivers/staging/crystalhd
parent89a4d0cbdee5289025c38b6b9706ad5dc5df264b (diff)
Staging: crystalhd: change GFP_ATOMIC to GFP_KERNEL
These two allocations are only called from the probe() path and there aren't any locks held for probe(). Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/crystalhd')
-rw-r--r--drivers/staging/crystalhd/crystalhd_lnx.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
index 719e70bc871e..9a6b650cd608 100644
--- a/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/drivers/staging/crystalhd/crystalhd_lnx.c
@@ -393,8 +393,7 @@ static int __devinit chd_dec_init_chdev(struct crystalhd_adp *adp)
/* Allocate general purpose ioctl pool. */
for (i = 0; i < CHD_IODATA_POOL_SZ; i++) {
- /* FIXME: jarod: why atomic? */
- temp = kzalloc(sizeof(struct crystalhd_ioctl_data), GFP_ATOMIC);
+ temp = kzalloc(sizeof(struct crystalhd_ioctl_data), GFP_KERNEL);
if (!temp) {
BCMLOG_ERR("ioctl data pool kzalloc failed\n");
rc = -ENOMEM;
@@ -549,8 +548,7 @@ static int __devinit chd_dec_pci_probe(struct pci_dev *pdev,
pdev->vendor, pdev->device, pdev->subsystem_vendor,
pdev->subsystem_device);
- /* FIXME: jarod: why atomic? */
- pinfo = kzalloc(sizeof(struct crystalhd_adp), GFP_ATOMIC);
+ pinfo = kzalloc(sizeof(struct crystalhd_adp), GFP_KERNEL);
if (!pinfo) {
BCMLOG_ERR("Failed to allocate memory\n");
return -ENOMEM;