summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShannon Nelson <shannon.nelson@intel.com>2007-12-17 16:20:08 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-17 19:28:17 -0800
commitbb8e8bcce7eceacb52eb0a3ebb64202ad6bcc438 (patch)
treebe4aec4e38ff481f4e65f3af077ef49e7a7a9eac
parent711924b1052a280bd2452c3babb9816e4a77c723 (diff)
downloadlinux-bb8e8bcce7eceacb52eb0a3ebb64202ad6bcc438.tar.bz2
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>
-rw-r--r--drivers/dma/ioat_dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c
index c17ec3276062..45e7b4666c7b 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;
}