lis3: free regulators if probe() fails

[deliverable/linux.git] / drivers / uio / uio.c

diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index d2efe823c20dd7fc317a1ffc0e12c283138e531d..a783d533a1a6fe662e99cd26ebec87c6569bd9bf 100644 (file)
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -69,7 +69,7 @@ static ssize_t map_name_show(struct uio_mem *mem, char *buf)
 
 static ssize_t map_addr_show(struct uio_mem *mem, char *buf)
 {
-       return sprintf(buf, "0x%lx\n", mem->addr);
+       return sprintf(buf, "0x%llx\n", (unsigned long long)mem->addr);
 }
 
 static ssize_t map_size_show(struct uio_mem *mem, char *buf)
@@ -79,7 +79,7 @@ static ssize_t map_size_show(struct uio_mem *mem, char *buf)
 
 static ssize_t map_offset_show(struct uio_mem *mem, char *buf)
 {
-       return sprintf(buf, "0x%lx\n", mem->addr & ~PAGE_MASK);
+       return sprintf(buf, "0x%llx\n", (unsigned long long)mem->addr & ~PAGE_MASK);
 }
 
 struct map_sysfs_entry {
@@ -634,8 +634,7 @@ static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
        if (idev->info->mem[mi].memtype == UIO_MEM_LOGICAL)
                page = virt_to_page(idev->info->mem[mi].addr + offset);
        else
-               page = vmalloc_to_page((void *)idev->info->mem[mi].addr
-                                                       + offset);
+               page = vmalloc_to_page((void *)(unsigned long)idev->info->mem[mi].addr + offset);
        get_page(page);
        vmf->page = page;
        return 0;
@@ -750,14 +749,13 @@ static int uio_major_init(void)
 
        uio_major = MAJOR(uio_dev);
        uio_cdev = cdev;
-       result = 0;
-out:
-       return result;
+       return 0;
 out_put:
        kobject_put(&cdev->kobj);
 out_unregister:
        unregister_chrdev_region(uio_dev, UIO_MAX_DEVICES);
-       goto out;
+out:
+       return result;
 }
 
 static void uio_major_cleanup(void)