diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 01:00:20 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 01:00:20 -0400 |
| commit | 4b61bb575b1fb42ab1df228ae7812e5135f656da (patch) | |
| tree | 03456466e6f678456ea462a7da4b352d1aa03aa3 /drivers/parisc/lba_pci.c | |
| parent | 805423e84e900e56c834aadee61a020b0d5092c3 (diff) | |
| parent | 326ba5010a5429a5a528b268b36a5900d4ab0eba (diff) | |
Merge commit 'v2.6.31-rc8' into next
Diffstat (limited to 'drivers/parisc/lba_pci.c')
| -rw-r--r-- | drivers/parisc/lba_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c index ede614616f8e..3aeb3279c92a 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c | |||
| @@ -992,7 +992,7 @@ lba_pat_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev) | |||
| 992 | return; | 992 | return; |
| 993 | 993 | ||
| 994 | io_pdc_cell = kzalloc(sizeof(pdc_pat_cell_mod_maddr_block_t), GFP_KERNEL); | 994 | io_pdc_cell = kzalloc(sizeof(pdc_pat_cell_mod_maddr_block_t), GFP_KERNEL); |
| 995 | if (!pa_pdc_cell) { | 995 | if (!io_pdc_cell) { |
| 996 | kfree(pa_pdc_cell); | 996 | kfree(pa_pdc_cell); |
| 997 | return; | 997 | return; |
| 998 | } | 998 | } |