From 71d47dab7b3be7a7f0b953a20aebe98899fdb2a2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 19 Aug 2018 19:22:56 +0200 Subject: [PATCH] drop 3.18.y patches that broke the build --- .../alsa-seq-fix-poll-error-return.patch | 46 ------------ queue-3.18/series | 2 - .../usb-option-add-support-for-dw5821e.patch | 72 ------------------- 3 files changed, 120 deletions(-) delete mode 100644 queue-3.18/alsa-seq-fix-poll-error-return.patch delete mode 100644 queue-3.18/usb-option-add-support-for-dw5821e.patch diff --git a/queue-3.18/alsa-seq-fix-poll-error-return.patch b/queue-3.18/alsa-seq-fix-poll-error-return.patch deleted file mode 100644 index 7f8f6103e5f..00000000000 --- a/queue-3.18/alsa-seq-fix-poll-error-return.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a49a71f6e25da2acc637fcd31e73debd96ca18f8 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Wed, 25 Jul 2018 16:34:12 +0200 -Subject: ALSA: seq: Fix poll() error return - -From: Takashi Iwai - -commit a49a71f6e25da2acc637fcd31e73debd96ca18f8 upstream. - -The sanity checks in ALSA sequencer and OSS sequencer emulation codes -return falsely -ENXIO from poll callback. They should be EPOLLERR -instead. - -This was caught thanks to the recent change to the return value. - -Cc: -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - sound/core/seq/oss/seq_oss.c | 2 +- - sound/core/seq/seq_clientmgr.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- a/sound/core/seq/oss/seq_oss.c -+++ b/sound/core/seq/oss/seq_oss.c -@@ -194,7 +194,7 @@ odev_poll(struct file *file, poll_table - struct seq_oss_devinfo *dp; - dp = file->private_data; - if (snd_BUG_ON(!dp)) -- return -ENXIO; -+ return EPOLLERR; - return snd_seq_oss_poll(dp, file, wait); - } - ---- a/sound/core/seq/seq_clientmgr.c -+++ b/sound/core/seq/seq_clientmgr.c -@@ -1110,7 +1110,7 @@ static unsigned int snd_seq_poll(struct - - /* check client structures are in place */ - if (snd_BUG_ON(!client)) -- return -ENXIO; -+ return EPOLLERR; - - if ((snd_seq_file_flags(file) & SNDRV_SEQ_LFLG_INPUT) && - client->data.user.fifo) { diff --git a/queue-3.18/series b/queue-3.18/series index 77eeb4c2ec7..12b35aa4e11 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -9,7 +9,5 @@ alsa-virmidi-fix-too-long-output-trigger-loop.patch alsa-cs5535audio-fix-invalid-endian-conversion.patch alsa-memalloc-don-t-exceed-over-the-requested-size.patch alsa-vxpocket-fix-invalid-endian-conversions.patch -alsa-seq-fix-poll-error-return.patch usb-serial-sierra-fix-potential-deadlock-at-close.patch -usb-option-add-support-for-dw5821e.patch serial-8250_dw-always-set-baud-rate-in-dw8250_set_termios.patch diff --git a/queue-3.18/usb-option-add-support-for-dw5821e.patch b/queue-3.18/usb-option-add-support-for-dw5821e.patch deleted file mode 100644 index 708ac235f64..00000000000 --- a/queue-3.18/usb-option-add-support-for-dw5821e.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 7bab01ecc6c43da882333c6db39741cb43677004 Mon Sep 17 00:00:00 2001 -From: Aleksander Morgado -Date: Tue, 24 Jul 2018 01:34:01 +0200 -Subject: USB: option: add support for DW5821e - -From: Aleksander Morgado - -commit 7bab01ecc6c43da882333c6db39741cb43677004 upstream. - -The device exposes AT, NMEA and DIAG ports in both USB configurations. - -The patch explicitly ignores interfaces 0 and 1, as they're bound to -other drivers already; and also interface 6, which is a GNSS interface -for which we don't have a driver yet. - -T: Bus=01 Lev=03 Prnt=04 Port=00 Cnt=01 Dev#= 18 Spd=480 MxCh= 0 -D: Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 2 -P: Vendor=413c ProdID=81d7 Rev=03.18 -S: Manufacturer=DELL -S: Product=DW5821e Snapdragon X20 LTE -S: SerialNumber=0123456789ABCDEF -C: #Ifs= 7 Cfg#= 2 Atr=a0 MxPwr=500mA -I: If#= 0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim -I: If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim -I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option -I: If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option -I: If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option -I: If#= 5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option -I: If#= 6 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) - -T: Bus=01 Lev=03 Prnt=04 Port=00 Cnt=01 Dev#= 16 Spd=480 MxCh= 0 -D: Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 2 -P: Vendor=413c ProdID=81d7 Rev=03.18 -S: Manufacturer=DELL -S: Product=DW5821e Snapdragon X20 LTE -S: SerialNumber=0123456789ABCDEF -C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA -I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan -I: If#= 1 Alt= 0 #EPs= 1 Cls=03(HID ) Sub=00 Prot=00 Driver=usbhid -I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option -I: If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option -I: If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option -I: If#= 5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option - -Signed-off-by: Aleksander Morgado -Cc: stable -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/usb/serial/option.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/usb/serial/option.c -+++ b/drivers/usb/serial/option.c -@@ -199,6 +199,8 @@ static void option_instat_callback(struc - #define DELL_PRODUCT_5800_V2_MINICARD_VZW 0x8196 /* Novatel E362 */ - #define DELL_PRODUCT_5804_MINICARD_ATT 0x819b /* Novatel E371 */ - -+#define DELL_PRODUCT_5821E 0x81d7 -+ - #define KYOCERA_VENDOR_ID 0x0c88 - #define KYOCERA_PRODUCT_KPC650 0x17da - #define KYOCERA_PRODUCT_KPC680 0x180a -@@ -1153,6 +1155,8 @@ static const struct usb_device_id option - { USB_DEVICE_AND_INTERFACE_INFO(DELL_VENDOR_ID, DELL_PRODUCT_5800_MINICARD_VZW, 0xff, 0xff, 0xff) }, - { USB_DEVICE_AND_INTERFACE_INFO(DELL_VENDOR_ID, DELL_PRODUCT_5800_V2_MINICARD_VZW, 0xff, 0xff, 0xff) }, - { USB_DEVICE_AND_INTERFACE_INFO(DELL_VENDOR_ID, DELL_PRODUCT_5804_MINICARD_ATT, 0xff, 0xff, 0xff) }, -+ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5821E), -+ .driver_info = RSVD(0) | RSVD(1) | RSVD(6) }, - { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) }, /* ADU-E100, ADU-310 */ - { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) }, - { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_620UW) }, -- 2.47.3