summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWei Yang <Wei.Yang@windriver.com>2012-10-24 07:21:36 +0200
committerDavid S. Miller <davem@davemloft.net>2012-10-25 05:18:59 +0200
commit2b9c128e9580e79db48bd3aacb2b4873544e01e8 (patch)
treecd5685d5210b615c482746afd914e05cf695d692 /drivers
parentMerge branch 'fixes-for-3.7' of git://gitorious.org/linux-can/linux-can (diff)
downloadlinux-2b9c128e9580e79db48bd3aacb2b4873544e01e8.tar.xz
linux-2b9c128e9580e79db48bd3aacb2b4873544e01e8.zip
gianfar_ptp: use iomem, not ioports resource tree in probe
When using a 36 bit dtb file, the driver complains "resource busy". Investigating the source of the message leads one to the gianfar_ptp_probe function. Since the type of the device resource requested in this function is IORESOURCE_MEM, it should use "iomem_resource" instead of "ioports_resource". Signed-off-by: Wei Yang <Wei.Yang@windriver.com> Cc: Claudiu Manoil <claudiu.manoil@freescale.com> Cc: Timur Tabi <timur@freescale.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/freescale/gianfar_ptp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c
index b9db0e040563..2e5daee0438a 100644
--- a/drivers/net/ethernet/freescale/gianfar_ptp.c
+++ b/drivers/net/ethernet/freescale/gianfar_ptp.c
@@ -478,7 +478,7 @@ static int gianfar_ptp_probe(struct platform_device *dev)
pr_err("no resource\n");
goto no_resource;
}
- if (request_resource(&ioport_resource, etsects->rsrc)) {
+ if (request_resource(&iomem_resource, etsects->rsrc)) {
pr_err("resource busy\n");
goto no_resource;
}