From 37ed44a1eed1ee53b7b1e21ea688a26162394983 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 4 Jul 2013 07:47:32 -0600 Subject: [PATCH] Fix type in the USB composite device driver --- ChangeLog | 3 +++ configs/arduino-due/README.txt | 4 +++- drivers/usbdev/composite.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9750a63f8e..17c2309681 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5108,4 +5108,7 @@ Change error to ERROR (2013-7-3). * arch/arm/src/sam34/sam_gpioirq.c: Fix some errors for interrupts on ports D-F (2013-7-3). + * /drivers/usbdev/composite.c: Fix a type in the composite device + driver unitialization logic. DEV1 should be DEV2 in one case + (2013-7-4). diff --git a/configs/arduino-due/README.txt b/configs/arduino-due/README.txt index 0e0f4224b6..546a57ec4a 100644 --- a/configs/arduino-due/README.txt +++ b/configs/arduino-due/README.txt @@ -187,7 +187,9 @@ ITEAD 2.4" TFT with Touch 5. Either PA28 or PC29 may drive PWM10 6. The schematics I have do not agree with the documentation. The Touch IRQ and Dout pins are reversed in the Documentation (D9 an D8, respectively). - I am assuming that the schematic is correct. + I am assuming that the schematic is correct (and the schematic does seem + to match up with what little I can see on the single visible side of the + board). SD Interface: diff --git a/drivers/usbdev/composite.c b/drivers/usbdev/composite.c index 530d644169..118f70e286 100644 --- a/drivers/usbdev/composite.c +++ b/drivers/usbdev/composite.c @@ -891,7 +891,7 @@ void composite_uninitialize(FAR void *handle) if (priv->dev2) { - DEV1_UNINITIALIZE(priv->dev2); + DEV2_UNINITIALIZE(priv->dev2); priv->dev2 = NULL; }