diff --git a/[refs] b/[refs]
index 61fe46096e62..2de6252f9075 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30433d8141e239fe3621c882170876b9e5a2a94b
+refs/heads/master: 8492090542b8bc6b65b60ccf0b49ff8f0a460ab2
diff --git a/trunk/drivers/ide/tx4938ide.c b/trunk/drivers/ide/tx4938ide.c
index ea89fddeed91..fd59c0d235b5 100644
--- a/trunk/drivers/ide/tx4938ide.c
+++ b/trunk/drivers/ide/tx4938ide.c
@@ -146,7 +146,7 @@ static int __init tx4938ide_probe(struct platform_device *pdev)
 		return -ENODEV;
 
 	if (!devm_request_mem_region(&pdev->dev, res->start,
-				     res->end - res->start + 1, "tx4938ide"))
+				     resource_size(res), "tx4938ide"))
 		return -EBUSY;
 	mapbase = (unsigned long)devm_ioremap(&pdev->dev, res->start,
 					      8 << pdata->ioport_shift);