diff options
author | Dan Carpenter <error27@gmail.com> | 2011-03-14 05:33:37 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-14 14:47:08 -0400 |
commit | a3b6ff03527247c81eab37d95b7fb36e7eda1939 (patch) | |
tree | e2b2fd7b7c8c161aa771a95bdbd20f937bfa9e02 /drivers/staging | |
parent | 89a4d0cbdee5289025c38b6b9706ad5dc5df264b (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')
-rw-r--r-- | drivers/staging/crystalhd/crystalhd_lnx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c index 719e70bc871..9a6b650cd60 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) | |||
393 | 393 | ||
394 | /* Allocate general purpose ioctl pool. */ | 394 | /* Allocate general purpose ioctl pool. */ |
395 | for (i = 0; i < CHD_IODATA_POOL_SZ; i++) { | 395 | for (i = 0; i < CHD_IODATA_POOL_SZ; i++) { |
396 | /* FIXME: jarod: why atomic? */ | 396 | temp = kzalloc(sizeof(struct crystalhd_ioctl_data), GFP_KERNEL); |
397 | temp = kzalloc(sizeof(struct crystalhd_ioctl_data), GFP_ATOMIC); | ||
398 | if (!temp) { | 397 | if (!temp) { |
399 | BCMLOG_ERR("ioctl data pool kzalloc failed\n"); | 398 | BCMLOG_ERR("ioctl data pool kzalloc failed\n"); |
400 | rc = -ENOMEM; | 399 | rc = -ENOMEM; |
@@ -549,8 +548,7 @@ static int __devinit chd_dec_pci_probe(struct pci_dev *pdev, | |||
549 | pdev->vendor, pdev->device, pdev->subsystem_vendor, | 548 | pdev->vendor, pdev->device, pdev->subsystem_vendor, |
550 | pdev->subsystem_device); | 549 | pdev->subsystem_device); |
551 | 550 | ||
552 | /* FIXME: jarod: why atomic? */ | 551 | pinfo = kzalloc(sizeof(struct crystalhd_adp), GFP_KERNEL); |
553 | pinfo = kzalloc(sizeof(struct crystalhd_adp), GFP_ATOMIC); | ||
554 | if (!pinfo) { | 552 | if (!pinfo) { |
555 | BCMLOG_ERR("Failed to allocate memory\n"); | 553 | BCMLOG_ERR("Failed to allocate memory\n"); |
556 | return -ENOMEM; | 554 | return -ENOMEM; |