From 5487c942d86eff4a2f8a3705015e978338cc779f Mon Sep 17 00:00:00 2001 From: Arthur Benilov Date: Tue, 16 Feb 2010 15:40:58 +0100 Subject: [PATCH] --- yaml --- r: 186797 b: refs/heads/master c: 5188d74cc4597a63a0907b8996ca0a2d36f1b970 h: refs/heads/master i: 186795: dcd605d2de2bf51a6a69ec6f14d7a87a51a700a3 v: v3 --- [refs] | 2 +- trunk/drivers/staging/vme/devices/vme_user.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7b325ff368d0..18d5e8198cc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 877de4b4866f1cc0a25a4d67d3927304556f5d1f +refs/heads/master: 5188d74cc4597a63a0907b8996ca0a2d36f1b970 diff --git a/trunk/drivers/staging/vme/devices/vme_user.c b/trunk/drivers/staging/vme/devices/vme_user.c index ddecbe5105b9..0d404f1a27f4 100644 --- a/trunk/drivers/staging/vme/devices/vme_user.c +++ b/trunk/drivers/staging/vme/devices/vme_user.c @@ -701,8 +701,12 @@ static int __init vme_user_probe(struct device *dev, int cur_bus, int cur_slot) /* Request slave resources and allocate buffers (128kB wide) */ for (i = SLAVE_MINOR; i < (SLAVE_MAX + 1); i++) { /* XXX Need to properly request attributes */ + /* For ca91cx42 bridge there are only two slave windows + * supporting A16 addressing, so we request A24 supported + * by all windows. + */ image[i].resource = vme_slave_request(vme_user_bridge, - VME_A16, VME_SCT); + VME_A24, VME_SCT); if (image[i].resource == NULL) { printk(KERN_WARNING "Unable to allocate slave " "resource\n");