diff options
author | Shannon Nelson <shannon.nelson@intel.com> | 2007-12-17 16:20:08 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 19:28:17 -0800 |
commit | bb8e8bcce7eceacb52eb0a3ebb64202ad6bcc438 (patch) | |
tree | be4aec4e38ff481f4e65f3af077ef49e7a7a9eac /drivers/dma/ioat_dma.c | |
parent | 711924b1052a280bd2452c3babb9816e4a77c723 (diff) | |
download | op-kernel-dev-bb8e8bcce7eceacb52eb0a3ebb64202ad6bcc438.zip op-kernel-dev-bb8e8bcce7eceacb52eb0a3ebb64202ad6bcc438.tar.gz |
I/OAT: fix null device in call to dev_err()
We can't use the device in a dev_err() after a kzalloc failure or after the
kfree, so simplify it to the pdev that was originally passed in.
Cc: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/dma/ioat_dma.c')
-rw-r--r-- | drivers/dma/ioat_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c index c17ec32..45e7b46 100644 --- a/drivers/dma/ioat_dma.c +++ b/drivers/dma/ioat_dma.c @@ -1363,7 +1363,7 @@ err_completion_pool: err_dma_pool: kfree(device); err_kzalloc: - dev_err(&device->pdev->dev, + dev_err(&pdev->dev, "Intel(R) I/OAT DMA Engine initialization failed\n"); return NULL; } |