usb: gadget: renesas_usbhs: bugfix: don't modify platform data

[mv-sheeva.git] / drivers / usb / renesas_usbhs / common.c

diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c
index c3aef40fa9e581ba49ccc4f170fef45b541b96b3..d2e2efaba658c6c20c485e2de2d839b8a926d005 100644 (file)
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/drivers/usb/renesas_usbhs/common.c
@@ -61,8 +61,8 @@
  */
 #define usbhs_platform_call(priv, func, args...)\
        (!(priv) ? -ENODEV :                    \
-        !((priv)->pfunc->func) ? 0 :           \
-        (priv)->pfunc->func(args))
+        !((priv)->pfunc.func) ? 0 :            \
+        (priv)->pfunc.func(args))
 
 /*
  *             common functions
@@ -446,24 +446,28 @@ static int __devinit usbhs_probe(struct platform_device *pdev)
        /*
         * care platform info
         */
-       priv->pfunc     = &info->platform_callback;
-       priv->dparam    = &info->driver_param;
+       memcpy(&priv->pfunc,
+              &info->platform_callback,
+              sizeof(struct renesas_usbhs_platform_callback));
+       memcpy(&priv->dparam,
+              &info->driver_param,
+              sizeof(struct renesas_usbhs_driver_param));
 
        /* set driver callback functions for platform */
        dfunc                   = &info->driver_callback;
        dfunc->notify_hotplug   = usbhsc_drvcllbck_notify_hotplug;
 
        /* set default param if platform doesn't have */
-       if (!priv->dparam->pipe_type) {
-               priv->dparam->pipe_type = usbhsc_default_pipe_type;
-               priv->dparam->pipe_size = ARRAY_SIZE(usbhsc_default_pipe_type);
+       if (!priv->dparam.pipe_type) {
+               priv->dparam.pipe_type = usbhsc_default_pipe_type;
+               priv->dparam.pipe_size = ARRAY_SIZE(usbhsc_default_pipe_type);
        }
-       if (!priv->dparam->pio_dma_border)
-               priv->dparam->pio_dma_border = 64; /* 64byte */
+       if (!priv->dparam.pio_dma_border)
+               priv->dparam.pio_dma_border = 64; /* 64byte */
 
        /* FIXME */
        /* runtime power control ? */
-       if (priv->pfunc->get_vbus)
+       if (priv->pfunc.get_vbus)
                usbhsc_flags_set(priv, USBHSF_RUNTIME_PWCTRL);
 
        /*