Re: linux-next: build failure after merge of the driver-core tree

Alan Stern
2012-01-27T15:24:42Z

On Fri, 27 Jan 2012, Stephen Rothwell wrote:

> Hi Greg,
>
> After merging the driver-core tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/pci/xen-pcifront.c: In function 'pcifront_common_process':
> drivers/pci/xen-pcifront.c:596:6: error: used struct type value where scalar is required
>
> Caused by commit f3ff9247088a ("Remove useless get_driver()/put_driver()
> calls").
>
> Please build test this stuff ...
>
> I have used the driver-core tree from next-20120125 for today.

Sorry about the mistake. I don't always build-test everything because
it's not easy to do it on my system. Anyway, the patch below will
fix the problem.

Alan Stern

-----------------------------------------------------------------
Subject: [PATCH] PCI/XEN: Fix bug introduced by a recent change

This patch (as1516) fixes a bug introduced during the removal of
put_driver() and get_driver() from drivers/pci/xen-pcifront.c.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>

---

drivers/pci/xen-pcifront.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Index: usb-3.3/drivers/pci/xen-pcifront.c
===================================================================
--- usb-3.3.orig/drivers/pci/xen-pcifront.c
+++ usb-3.3/drivers/pci/xen-pcifront.c
@@ -593,7 +593,7 @@ static pci_ers_result_t pcifront_common_
}
pdrv = pcidev->driver;

- if (pdrv->driver) {
+ if (pdrv) {
if (pdrv->err_handler && pdrv->err_handler->error_detected) {
dev_dbg(&pcidev->dev,
"trying to call AER service\n");