I/OAT: fix null device in call to dev_err()

Shannon Nelson · Linus Torvalds · commit bb8e8bcce7ec · 2007-12-17T19:28:17.000-08:00
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 &lt;snakebyte@gmx.de&gt;
Signed-off-by: Shannon Nelson &lt;shannon.nelson@intel.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c
@@ -1363,7 +1363,7 @@ struct ioatdma_device *ioat_dma_probe(struct pci_dev *pdev,
 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -1363,7 +1363,7 @@ struct ioatdma_device ioat_dma_probe(struct pci_dev pdev,`
`1363`	`1363`	`err_dma_pool:`
`1364`	`1364`	`kfree(device);`
`1365`	`1365`	`err_kzalloc:`
`1366`		`- dev_err(&device->pdev->dev,`
	`1366`	`+ dev_err(&pdev->dev,`
`1367`	`1367`	`"Intel(R) I/OAT DMA Engine initialization failed\n");`
`1368`	`1368`	`return NULL;`
`1369`	`1369`	`}`