aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Benilov <arthur.benilov@iba-group.com>2010-02-16 09:40:58 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-03 19:43:02 -0500
commit5188d74cc4597a63a0907b8996ca0a2d36f1b970 (patch)
treec3ad5457be4e6a2c9d92c15a5a85300f9f916639
parent877de4b4866f1cc0a25a4d67d3927304556f5d1f (diff)
Staging: vme: Use A24 when requesting slave resource
When requesting slave resources A16 addressing mode flag is used to find available windows. Since the ca91cx42 bridge only supports two A16 slave windows but four are requested, the driver fails to initialize. The flag has been changed to A24, which is supported by all slave windows. Signed-off-by: Arthur Benilov <arthur.benilov@iba-group.com> Signed-off-by: Vincent Bossier <vincent.bossier@iba-group.com> Acked-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/vme/devices/vme_user.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
index ddecbe5105b9..0d404f1a27f4 100644
--- a/drivers/staging/vme/devices/vme_user.c
+++ b/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)
701 /* Request slave resources and allocate buffers (128kB wide) */ 701 /* Request slave resources and allocate buffers (128kB wide) */
702 for (i = SLAVE_MINOR; i < (SLAVE_MAX + 1); i++) { 702 for (i = SLAVE_MINOR; i < (SLAVE_MAX + 1); i++) {
703 /* XXX Need to properly request attributes */ 703 /* XXX Need to properly request attributes */
704 /* For ca91cx42 bridge there are only two slave windows
705 * supporting A16 addressing, so we request A24 supported
706 * by all windows.
707 */
704 image[i].resource = vme_slave_request(vme_user_bridge, 708 image[i].resource = vme_slave_request(vme_user_bridge,
705 VME_A16, VME_SCT); 709 VME_A24, VME_SCT);
706 if (image[i].resource == NULL) { 710 if (image[i].resource == NULL) {
707 printk(KERN_WARNING "Unable to allocate slave " 711 printk(KERN_WARNING "Unable to allocate slave "
708 "resource\n"); 712 "resource\n");