summaryrefslogtreecommitdiffstats
path: root/drivers/usb/ibmcam.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/ibmcam.c')
-rw-r--r--drivers/usb/ibmcam.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/ibmcam.c b/drivers/usb/ibmcam.c
index 6b85a15f0..86360f687 100644
--- a/drivers/usb/ibmcam.c
+++ b/drivers/usb/ibmcam.c
@@ -205,8 +205,10 @@ static inline unsigned long uvirt_to_kva(pgd_t *pgd, unsigned long adr)
if (!pmd_none(*pmd)) {
ptep = pte_offset(pmd, adr);
pte = *ptep;
- if (pte_present(pte))
- ret = page_address(pte_page(pte)) | (adr & (PAGE_SIZE-1));
+ if (pte_present(pte)) {
+ ret = (unsigned long) page_address(pte_page(pte));
+ ret |= (adr & (PAGE_SIZE - 1));
+ }
}
}
MDEBUG(printk("uv2kva(%lx-->%lx)", adr, ret));