diff --git a/[refs] b/[refs]
index dbf3b85bc65e..adef63240f57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c813f592a5e65cfd9321f51c95a6977e9518dde6
+refs/heads/master: 70d7aa889f7c107a768d07389998e4fd89a7103d
diff --git a/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c b/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c
index 74d54bb3f8e6..1cf3e91db59d 100644
--- a/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c
+++ b/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c
@@ -1171,7 +1171,9 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	vme_unregister_bridge(ca91cx42_bridge);
 err_reg:
 	ca91cx42_crcsr_exit(pdev);
+#if 0
 err_crcsr:
+#endif
 err_lm:
 	/* resources are stored in link list */
 	list_for_each(pos, &(ca91cx42_bridge->lm_resources)) {
@@ -1226,7 +1228,6 @@ void ca91cx42_remove(struct pci_dev *pdev)
 	struct vme_slave_resource *slave_image;
 	struct vme_dma_resource *dma_ctrlr;
 	struct vme_lm_resource *lm;
-	int i;
 
 	/* Turn off Ints */
 	iowrite32(0, ca91cx42_bridge->base + LINT_EN);