aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-05 17:09:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-07 06:33:59 -0800
commite65ec7a68de6a0d409a5750b2fbd7ebca9acf5a3 (patch)
treed15886a26197bd5dab06f6136f163837f7ebe216
parenteb7632f593b81066da4de44bc001974d6726a118 (diff)
downloadopenembedded-core-e65ec7a68de6a0d409a5750b2fbd7ebca9acf5a3.zip
openembedded-core-e65ec7a68de6a0d409a5750b2fbd7ebca9acf5a3.tar.gz
openembedded-core-e65ec7a68de6a0d409a5750b2fbd7ebca9acf5a3.tar.bz2
usbutils: drop upstreamed patch
This has been fixed upstream since 008, albeit slightly differently so the patch continued to apply. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch28
-rw-r--r--meta/recipes-bsp/usbutils/usbutils_009.bb1
2 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch b/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch
deleted file mode 100644
index 0efdc59..0000000
--- a/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix NULL pointer crash.
-
-Before use usbbuslist, we should check if it is valid.
-
-Upstream-Status: Pending
-Signed-off-by: Roy.Li <rongqing.li@windriver.com>
----
- lsusb-t.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/lsusb-t.c b/lsusb-t.c
-index f604155..583a46a 100644
---- a/lsusb-t.c
-+++ b/lsusb-t.c
-@@ -643,6 +643,10 @@ static void sort_busses(void)
- /* need to reverse sort bus numbers */
- struct usbbusnode *t, *p, **pp;
- int swapped;
-+
-+ if (!usbbuslist)
-+ return;
-+
- do {
- p = usbbuslist;
- pp = &usbbuslist;
---
-1.7.4.1
-
diff --git a/meta/recipes-bsp/usbutils/usbutils_009.bb b/meta/recipes-bsp/usbutils/usbutils_009.bb
index a7cbe45..88c24bd 100644
--- a/meta/recipes-bsp/usbutils/usbutils_009.bb
+++ b/meta/recipes-bsp/usbutils/usbutils_009.bb
@@ -10,7 +10,6 @@ DEPENDS = "libusb zlib virtual/libiconv udev"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
file://usb-devices-avoid-dependency-on-bash.patch \
- file://Fix-NULL-pointer-crash.patch \
"
SRC_URI[md5sum] = "b5dbc498b2eb5058f7a57fc6532d0aad"