Commit a7eb169d authored by Dominik Brodowski's avatar Dominik Brodowski

pcmcia: m32r uses static socket resources

m32r_cfc sets the socket capabilities to SS_CAP_STATIC_MAP and
also sets io_offset != 0. This means no calls to
&pccard_nonstatic_ops went through. Therfore, replace it with
&pccard_static_ops which is exactly for this case.

CC: Mamoru Sakugawa <sakugawa@linux-m32r.org>
CC: Hirokazu Takata <takata@linux-m32r.org>
Tested-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent f9c316f4
...@@ -238,14 +238,12 @@ config PCMCIA_PROBE ...@@ -238,14 +238,12 @@ config PCMCIA_PROBE
config M32R_PCC config M32R_PCC
bool "M32R PCMCIA I/F" bool "M32R PCMCIA I/F"
depends on M32R && CHIP_M32700 && PCMCIA depends on M32R && CHIP_M32700 && PCMCIA
select PCCARD_NONSTATIC
help help
Say Y here to use the M32R PCMCIA controller. Say Y here to use the M32R PCMCIA controller.
config M32R_CFC config M32R_CFC
bool "M32R CF I/F Controller" bool "M32R CF I/F Controller"
depends on M32R && (PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_MAPPI3 || PLAT_OPSPUT) depends on M32R && (PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_MAPPI3 || PLAT_OPSPUT)
select PCCARD_NONSTATIC
help help
Say Y here to use the M32R CompactFlash controller. Say Y here to use the M32R CompactFlash controller.
......
...@@ -764,7 +764,7 @@ static int __init init_m32r_pcc(void) ...@@ -764,7 +764,7 @@ static int __init init_m32r_pcc(void)
for (i = 0 ; i < pcc_sockets ; i++) { for (i = 0 ; i < pcc_sockets ; i++) {
socket[i].socket.dev.parent = &pcc_device.dev; socket[i].socket.dev.parent = &pcc_device.dev;
socket[i].socket.ops = &pcc_operations; socket[i].socket.ops = &pcc_operations;
socket[i].socket.resource_ops = &pccard_nonstatic_ops; socket[i].socket.resource_ops = &pccard_static_ops;
socket[i].socket.owner = THIS_MODULE; socket[i].socket.owner = THIS_MODULE;
socket[i].number = i; socket[i].number = i;
ret = pcmcia_register_socket(&socket[i].socket); ret = pcmcia_register_socket(&socket[i].socket);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment