add some s-o-b to 3.18 and 4.4 patches

diff --git a/queue-3.18/revert-wlcore-add-missing-pm-call-for-wlcore_cmd_wai.patch b/queue-3.18/revert-wlcore-add-missing-pm-call-for-wlcore_cmd_wai.patch
index f399184a4d9bd87513e1a038f5986916a00edf40..f736d21ed8176e10386a5099713d2612686181fa 100644 (file)
--- a/queue-3.18/revert-wlcore-add-missing-pm-call-for-wlcore_cmd_wai.patch
+++ b/queue-3.18/revert-wlcore-add-missing-pm-call-for-wlcore_cmd_wai.patch
@@ -50,12 +50,11 @@ From Dietmar May's report on the stable mailing list
 > wl1271_ps_elp_wakeup() or wl1271_ps_elp_sleep(), as occurs in the patch.
 
 Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/net/wireless/ti/wlcore/cmd.c | 6 ------
+ drivers/net/wireless/ti/wlcore/cmd.c |    6 ------
  1 file changed, 6 deletions(-)
 
-diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
-index de43c0376143..05604ee31224 100644
 --- a/drivers/net/wireless/ti/wlcore/cmd.c
 +++ b/drivers/net/wireless/ti/wlcore/cmd.c
 @@ -35,7 +35,6 @@
@@ -66,7 +65,7 @@ index de43c0376143..05604ee31224 100644
  #include "tx.h"
  #include "hw_ops.h"
  
-@@ -188,10 +187,6 @@ int wlcore_cmd_wait_for_event_or_timeout(struct wl1271 *wl,
+@@ -188,10 +187,6 @@ int wlcore_cmd_wait_for_event_or_timeout
  
        timeout_time = jiffies + msecs_to_jiffies(WL1271_EVENT_TIMEOUT);
  
@@ -77,7 +76,7 @@ index de43c0376143..05604ee31224 100644
        do {
                if (time_after(jiffies, timeout_time)) {
                        wl1271_debug(DEBUG_CMD, "timeout waiting for event %d",
-@@ -223,7 +218,6 @@ int wlcore_cmd_wait_for_event_or_timeout(struct wl1271 *wl,
+@@ -223,7 +218,6 @@ int wlcore_cmd_wait_for_event_or_timeout
        } while (!event);
  
  out:
@@ -85,6 +84,3 @@ index de43c0376143..05604ee31224 100644
        kfree(events_vector);
        return ret;
  }
--- 
-2.17.1
-

diff --git a/queue-4.4/media-em28xx-fix-use-after-free-when-disconnecting.patch b/queue-4.4/media-em28xx-fix-use-after-free-when-disconnecting.patch
index 32d28f8b2cf4ac1d159b8f544c11053152bd9f39..5ef7f2cd45a43dd196cd061e2d815dd0869bac5a 100644 (file)
--- a/queue-4.4/media-em28xx-fix-use-after-free-when-disconnecting.patch
+++ b/queue-4.4/media-em28xx-fix-use-after-free-when-disconnecting.patch
@@ -61,15 +61,14 @@ When the dvb frontend is unregistered afterwards it leads to this oops:
 Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
 Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/media/usb/em28xx/em28xx-dvb.c | 3 ++-
+ drivers/media/usb/em28xx/em28xx-dvb.c |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
-index 357be76c7a55..5502a0fb94fd 100644
 --- a/drivers/media/usb/em28xx/em28xx-dvb.c
 +++ b/drivers/media/usb/em28xx/em28xx-dvb.c
-@@ -1806,6 +1806,8 @@ static int em28xx_dvb_fini(struct em28xx *dev)
+@@ -1806,6 +1806,8 @@ static int em28xx_dvb_fini(struct em28xx
                }
        }
  
@@ -78,7 +77,7 @@ index 357be76c7a55..5502a0fb94fd 100644
        /* remove I2C SEC */
        client = dvb->i2c_client_sec;
        if (client) {
-@@ -1827,7 +1829,6 @@ static int em28xx_dvb_fini(struct em28xx *dev)
+@@ -1827,7 +1829,6 @@ static int em28xx_dvb_fini(struct em28xx
                i2c_unregister_device(client);
        }
  
@@ -86,6 +85,3 @@ index 357be76c7a55..5502a0fb94fd 100644
        kfree(dvb);
        dev->dvb = NULL;
        kref_put(&dev->ref, em28xx_free_device);
--- 
-2.17.1
-

diff --git a/queue-4.4/revert-wlcore-add-missing-pm-call-for-wlcore_cmd_wai.patch b/queue-4.4/revert-wlcore-add-missing-pm-call-for-wlcore_cmd_wai.patch
index dacf0cbac9dc5b065bc3e4a5ca0a54c8977de9a0..04d71dc576416448c5e093816b0791c83dbb62b9 100644 (file)
--- a/queue-4.4/revert-wlcore-add-missing-pm-call-for-wlcore_cmd_wai.patch
+++ b/queue-4.4/revert-wlcore-add-missing-pm-call-for-wlcore_cmd_wai.patch
@@ -50,12 +50,11 @@ From Dietmar May's report on the stable mailing list
 > wl1271_ps_elp_wakeup() or wl1271_ps_elp_sleep(), as occurs in the patch.
 
 Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/net/wireless/ti/wlcore/cmd.c | 6 ------
+ drivers/net/wireless/ti/wlcore/cmd.c |    6 ------
  1 file changed, 6 deletions(-)
 
-diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
-index 15dc7a398b90..f01d24baff7c 100644
 --- a/drivers/net/wireless/ti/wlcore/cmd.c
 +++ b/drivers/net/wireless/ti/wlcore/cmd.c
 @@ -35,7 +35,6 @@
@@ -66,7 +65,7 @@ index 15dc7a398b90..f01d24baff7c 100644
  #include "tx.h"
  #include "hw_ops.h"
  
-@@ -192,10 +191,6 @@ int wlcore_cmd_wait_for_event_or_timeout(struct wl1271 *wl,
+@@ -192,10 +191,6 @@ int wlcore_cmd_wait_for_event_or_timeout
  
        timeout_time = jiffies + msecs_to_jiffies(WL1271_EVENT_TIMEOUT);
  
@@ -77,7 +76,7 @@ index 15dc7a398b90..f01d24baff7c 100644
        do {
                if (time_after(jiffies, timeout_time)) {
                        wl1271_debug(DEBUG_CMD, "timeout waiting for event %d",
-@@ -227,7 +222,6 @@ int wlcore_cmd_wait_for_event_or_timeout(struct wl1271 *wl,
+@@ -227,7 +222,6 @@ int wlcore_cmd_wait_for_event_or_timeout
        } while (!event);
  
  out:
@@ -85,6 +84,3 @@ index 15dc7a398b90..f01d24baff7c 100644
        kfree(events_vector);
        return ret;
  }
--- 
-2.17.1
-