summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/usbutils
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:34:51 -0800
commite42aad1a7554aa29e1e9e2d37cb873b0fde48378 (patch)
tree3ff60c1b613b8fd6656fc5c5d08d059a88196c81 /meta/recipes-bsp/usbutils
parent68956c3a8651cb6dedaac625b5485eb32e8df29a (diff)
downloadpoky-e42aad1a7554aa29e1e9e2d37cb873b0fde48378.tar.gz
usbutils: drop upstreamed patch
This has been fixed upstream since 008, albeit slightly differently so the patch continued to apply. (From OE-Core rev: e65ec7a68de6a0d409a5750b2fbd7ebca9acf5a3) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/usbutils')
-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 0efdc59fc6..0000000000
--- a/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Fix NULL pointer crash.
2
3Before use usbbuslist, we should check if it is valid.
4
5Upstream-Status: Pending
6Signed-off-by: Roy.Li <rongqing.li@windriver.com>
7---
8 lsusb-t.c | 4 ++++
9 1 files changed, 4 insertions(+), 0 deletions(-)
10
11diff --git a/lsusb-t.c b/lsusb-t.c
12index f604155..583a46a 100644
13--- a/lsusb-t.c
14+++ b/lsusb-t.c
15@@ -643,6 +643,10 @@ static void sort_busses(void)
16 /* need to reverse sort bus numbers */
17 struct usbbusnode *t, *p, **pp;
18 int swapped;
19+
20+ if (!usbbuslist)
21+ return;
22+
23 do {
24 p = usbbuslist;
25 pp = &usbbuslist;
26--
271.7.4.1
28
diff --git a/meta/recipes-bsp/usbutils/usbutils_009.bb b/meta/recipes-bsp/usbutils/usbutils_009.bb
index a7cbe45406..88c24bd22a 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"
10 10
11SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ 11SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
12 file://usb-devices-avoid-dependency-on-bash.patch \ 12 file://usb-devices-avoid-dependency-on-bash.patch \
13 file://Fix-NULL-pointer-crash.patch \
14 " 13 "
15 14
16SRC_URI[md5sum] = "b5dbc498b2eb5058f7a57fc6532d0aad" 15SRC_URI[md5sum] = "b5dbc498b2eb5058f7a57fc6532d0aad"