2011-05-15 17:23:02 +00:00
|
|
|
--- a/drivers/cbus/tahvo-usb.c
|
|
|
|
|
+++ b/drivers/cbus/tahvo-usb.c
|
2011-03-09 18:26:03 +00:00
|
|
|
@@ -99,7 +99,7 @@ struct tahvo_usb {
|
|
|
|
|
int tahvo_mode;
|
|
|
|
|
#endif
|
|
|
|
|
};
|
|
|
|
|
-static struct platform_device tahvo_usb_device;
|
|
|
|
|
+static struct tahvo_usb *tahvo_usb_device;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* ---------------------------------------------------------------------------
|
|
|
|
|
@@ -114,8 +114,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 +200,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 +658,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
|
|
|
|
|
@@ -682,6 +682,7 @@ static int __init tahvo_usb_probe(struct
|
|
|
|
|
(unsigned long) tu, "vbus_interrupt");
|
|
|
|
|
if (ret != 0) {
|
|
|
|
|
kfree(tu);
|
|
|
|
|
+ tahvo_usb_device = NULL;
|
|
|
|
|
printk(KERN_ERR "Could not register Tahvo interrupt for VBUS\n");
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
@@ -708,6 +709,7 @@ static int __init tahvo_usb_probe(struct
|
|
|
|
|
ret = otg_set_transceiver(&tu->otg);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
printk(KERN_ERR "Cannot register USB transceiver\n");
|
|
|
|
|
+ tahvo_usb_device = NULL;
|
|
|
|
|
kfree(tu);
|
|
|
|
|
tahvo_free_irq(TAHVO_INT_VBUSON);
|
|
|
|
|
return ret;
|
|
|
|
|
@@ -732,6 +734,8 @@ static int __exit tahvo_usb_remove(struc
|
|
|
|
|
#ifdef CONFIG_USB_OTG
|
|
|
|
|
device_remove_file(&pdev->dev, &dev_attr_otg_mode);
|
|
|
|
|
#endif
|
|
|
|
|
+ tahvo_usb_device = NULL;
|
|
|
|
|
+
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
