drm/drm_crtc: return -EFAULT on copy_to_user errors

[safe/jmp/linux-2.6] / drivers / pcmcia / rsrc_mgr.c

diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index aca2cfd..142efac 100644 (file)
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -12,6 +12,7 @@
  * (C) 1999            David A. Hinds
  */
 
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 
@@ -21,7 +22,7 @@
 #include <pcmcia/cistpl.h>
 #include "cs_internal.h"
 
-static int static_init(struct pcmcia_socket *s)
+int static_init(struct pcmcia_socket *s)
 {
        /* the good thing about SS_CAP_STATIC_MAP sockets is
         * that they don't need a resource database */
@@ -31,118 +32,44 @@ static int static_init(struct pcmcia_socket *s)
        return 0;
 }
 
-
-struct pccard_resource_ops pccard_static_ops = {
-       .validate_mem = NULL,
-       .adjust_io_region = NULL,
-       .find_io = NULL,
-       .find_mem = NULL,
-       .add_io = NULL,
-       .add_mem = NULL,
-       .init = static_init,
-       .exit = NULL,
-};
-EXPORT_SYMBOL(pccard_static_ops);
-
-
-#ifdef CONFIG_PCCARD_IODYN
-
-static struct resource *
-make_resource(unsigned long b, unsigned long n, int flags, char *name)
+struct resource *pcmcia_make_resource(unsigned long start, unsigned long end,
+                               int flags, const char *name)
 {
        struct resource *res = kzalloc(sizeof(*res), GFP_KERNEL);
 
        if (res) {
                res->name = name;
-               res->start = b;
-               res->end = b + n - 1;
+               res->start = start;
+               res->end = start + end - 1;
                res->flags = flags;
        }
        return res;
 }
 
-struct pcmcia_align_data {
-       unsigned long   mask;
-       unsigned long   offset;
-};
-
-static void pcmcia_align(void *align_data, struct resource *res,
-                       unsigned long size, unsigned long align)
+static int static_find_io(struct pcmcia_socket *s, unsigned int attr,
+                       unsigned int *base, unsigned int num,
+                       unsigned int align)
 {
-       struct pcmcia_align_data *data = align_data;
-       unsigned long start;
-
-       start = (res->start & ~data->mask) + data->offset;
-       if (start < res->start)
-               start += data->mask + 1;
-       res->start = start;
-
-#ifdef CONFIG_X86
-       if (res->flags & IORESOURCE_IO) {
-               if (start & 0x300) {
-                       start = (start + 0x3ff) & ~0x3ff;
-                       res->start = start;
-               }
-       }
-#endif
+       if (!s->io_offset)
+               return -EINVAL;
+       *base = s->io_offset | (*base & 0x0fff);
 
-#ifdef CONFIG_M68K
-       if (res->flags & IORESOURCE_IO) {
-               if ((res->start + size - 1) >= 1024)
-                       res->start = res->end;
-       }
-#endif
-}
-
-
-static int iodyn_adjust_io_region(struct resource *res, unsigned long r_start,
-                                     unsigned long r_end, struct pcmcia_socket *s)
-{
-       return adjust_resource(res, r_start, r_end - r_start + 1);
+       return 0;
 }
 
 
-static struct resource *iodyn_find_io_region(unsigned long base, int num,
-               unsigned long align, struct pcmcia_socket *s)
-{
-       struct resource *res = make_resource(0, num, IORESOURCE_IO,
-                                            dev_name(&s->dev));
-       struct pcmcia_align_data data;
-       unsigned long min = base;
-       int ret;
-
-       if (align == 0)
-               align = 0x10000;
-
-       data.mask = align - 1;
-       data.offset = base & data.mask;
-
-#ifdef CONFIG_PCI
-       if (s->cb_dev) {
-               ret = pci_bus_alloc_resource(s->cb_dev->bus, res, num, 1,
-                                            min, 0, pcmcia_align, &data);
-       } else
-#endif
-               ret = allocate_resource(&ioport_resource, res, num, min, ~0UL,
-                                       1, pcmcia_align, &data);
-
-       if (ret != 0) {
-               kfree(res);
-               res = NULL;
-       }
-       return res;
-}
-
-struct pccard_resource_ops pccard_iodyn_ops = {
+struct pccard_resource_ops pccard_static_ops = {
        .validate_mem = NULL,
-       .adjust_io_region = iodyn_adjust_io_region,
-       .find_io = iodyn_find_io_region,
+       .find_io = static_find_io,
        .find_mem = NULL,
        .add_io = NULL,
        .add_mem = NULL,
        .init = static_init,
        .exit = NULL,
 };
-EXPORT_SYMBOL(pccard_iodyn_ops);
+EXPORT_SYMBOL(pccard_static_ops);
+
 
-#endif /* CONFIG_PCCARD_IODYN */
+MODULE_AUTHOR("David A. Hinds, Dominik Brodowski");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("rsrc_nonstatic");