+ /*
+ * ---------------------------------------------------------------------------
+@@ -114,8 +115,7 @@ static struct platform_device *tahvo_otg
+
+ static irqreturn_t omap_otg_irq(int irq, void *arg)
+ {
+- struct platform_device *otg_dev = arg;
+- struct tahvo_usb *tu = platform_get_drvdata(otg_dev);
++ struct tahvo_usb *tu = arg;
+ u16 otg_irq;
+
+ otg_irq = omap_readw(OTG_IRQ_SRC);
+@@ -201,12 +201,12 @@ static int __init omap_otg_probe(struct
+
+ return request_irq(tahvo_otg_dev->resource[1].start,
+ omap_otg_irq, IRQF_DISABLED, DRIVER_NAME,
+- &tahvo_usb_device);
++ tahvo_usb_device);
+ }
+
+ static int __exit omap_otg_remove(struct platform_device *pdev)
+ {
+- free_irq(tahvo_otg_dev->resource[1].start, &tahvo_usb_device);
++ free_irq(tahvo_otg_dev->resource[1].start, tahvo_usb_device);
+ tahvo_otg_dev = NULL;
+
+ return 0;
+@@ -659,6 +659,7 @@ static int __init tahvo_usb_probe(struct
+ tu = kzalloc(sizeof(*tu), GFP_KERNEL);
+ if (!tu)
+ return -ENOMEM;
++ tahvo_usb_device = tu;
+
+ tu->pt_dev = container_of(dev, struct platform_device, dev);
+ #ifdef CONFIG_USB_OTG