From 272fa522ba7a3d6e02bda2f6990609ea9484e1c5 Mon Sep 17 00:00:00 2001 From: Manohar Vanga Date: Sun, 27 Feb 2011 00:15:35 +0100 Subject: [PATCH] --- yaml --- r: 236139 b: refs/heads/master c: 5bfcf90bfb1889885211e8a853c6b70500065fce h: refs/heads/master i: 236137: 78536df2dfff821f88547a3d4512ac7177c42e7f 236135: 4abf80dddc89f5e2361b920f73181971a83166fa v: v3 --- [refs] | 2 +- trunk/drivers/staging/vme/bridges/vme_ca91cx42.c | 3 --- trunk/drivers/staging/vme/bridges/vme_tsi148.c | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 72694182ae45..7949603e1f72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b00464677923a7878b8c3164d7462b80f641bba6 +refs/heads/master: 5bfcf90bfb1889885211e8a853c6b70500065fce diff --git a/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c b/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c index 42de83e6f1d9..5d734d9ed27d 100644 --- a/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c +++ b/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c @@ -560,8 +560,6 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image, return 0; - iounmap(image->kern_base); - image->kern_base = NULL; err_remap: release_resource(&image->bus_resource); err_resource: @@ -1782,7 +1780,6 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id) return 0; - vme_unregister_bridge(ca91cx42_bridge); err_reg: ca91cx42_crcsr_exit(ca91cx42_bridge, pdev); err_lm: diff --git a/trunk/drivers/staging/vme/bridges/vme_tsi148.c b/trunk/drivers/staging/vme/bridges/vme_tsi148.c index 26ea42fa784d..2df19eacbca5 100644 --- a/trunk/drivers/staging/vme/bridges/vme_tsi148.c +++ b/trunk/drivers/staging/vme/bridges/vme_tsi148.c @@ -869,8 +869,6 @@ static int tsi148_alloc_resource(struct vme_master_resource *image, return 0; - iounmap(image->kern_base); - image->kern_base = NULL; err_remap: release_resource(&image->bus_resource); err_resource: