diff --git a/[refs] b/[refs]
index 842376538b48..fafa127cd3c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6fe6b0783a8fd923d11dd0388cbd561ff15bdf1
+refs/heads/master: 1e0deabd35f210f22c03cc734a0335c07ae71ff3
diff --git a/trunk/drivers/parisc/dino.c b/trunk/drivers/parisc/dino.c
index c590974e9815..d69bde6a2343 100644
--- a/trunk/drivers/parisc/dino.c
+++ b/trunk/drivers/parisc/dino.c
@@ -614,7 +614,7 @@ dino_fixup_bus(struct pci_bus *bus)
 			    dev_name(&bus->self->dev), i,
 			    bus->self->resource[i].start,
 			    bus->self->resource[i].end);
-			pci_assign_resource(bus->self, i);
+			WARN_ON(pci_assign_resource(bus->self, i));
 			DBG("DEBUG %s after assign %d [0x%lx,0x%lx]\n",
 			    dev_name(&bus->self->dev), i,
 			    bus->self->resource[i].start,