From 25662f17b52a4aad2fd8d522c7f225245ac1f739 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 24 Apr 2012 08:50:58 -0700 Subject: [PATCH] 3.0-stable patches added patches: cfg80211-fix-interface-combinations-check.patch media-rc-core-set-mode-for-winbond-cir.patch --- ...211-fix-interface-combinations-check.patch | 28 +++++++++++++++ ...dia-rc-core-set-mode-for-winbond-cir.patch | 35 +++++++++++++++++++ queue-3.0/series | 2 ++ 3 files changed, 65 insertions(+) create mode 100644 queue-3.0/cfg80211-fix-interface-combinations-check.patch create mode 100644 queue-3.0/media-rc-core-set-mode-for-winbond-cir.patch diff --git a/queue-3.0/cfg80211-fix-interface-combinations-check.patch b/queue-3.0/cfg80211-fix-interface-combinations-check.patch new file mode 100644 index 00000000000..3261175bdb9 --- /dev/null +++ b/queue-3.0/cfg80211-fix-interface-combinations-check.patch @@ -0,0 +1,28 @@ +From e55a4046dab28c440c96890bdddcf02dc8981f2d Mon Sep 17 00:00:00 2001 +From: Lukasz Kucharczyk +Date: Wed, 11 Apr 2012 14:55:10 +0200 +Subject: cfg80211: fix interface combinations check. + +From: Lukasz Kucharczyk + +commit e55a4046dab28c440c96890bdddcf02dc8981f2d upstream. + +Signed-off-by: Lukasz Kucharczyk +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + net/wireless/util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/net/wireless/util.c ++++ b/net/wireless/util.c +@@ -990,7 +990,7 @@ int cfg80211_can_change_interface(struct + if (rdev->wiphy.software_iftypes & BIT(iftype)) + continue; + for (j = 0; j < c->n_limits; j++) { +- if (!(limits[j].types & iftype)) ++ if (!(limits[j].types & BIT(iftype))) + continue; + if (limits[j].max < num[iftype]) + goto cont; diff --git a/queue-3.0/media-rc-core-set-mode-for-winbond-cir.patch b/queue-3.0/media-rc-core-set-mode-for-winbond-cir.patch new file mode 100644 index 00000000000..89349813a93 --- /dev/null +++ b/queue-3.0/media-rc-core-set-mode-for-winbond-cir.patch @@ -0,0 +1,35 @@ +From d9b786955f80fb306471fdb9ea24c6d03af6ca36 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?David=20H=C3=A4rdeman?= +Date: Sun, 8 Apr 2012 06:13:04 -0300 +Subject: media: rc-core: set mode for winbond-cir +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: David Härdeman + +commit d9b786955f80fb306471fdb9ea24c6d03af6ca36 upstream. + +Setting the correct mode is required by rc-core or scancodes won't be +generated (which isn't very user-friendly). + +This one-line fix should be suitable for 3.4-rc2. + +Signed-off-by: David Härdeman +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/media/rc/winbond-cir.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/media/rc/winbond-cir.c ++++ b/drivers/media/rc/winbond-cir.c +@@ -1058,6 +1058,7 @@ wbcir_probe(struct pnp_dev *device, cons + goto exit_unregister_led; + } + ++ data->dev->driver_type = RC_DRIVER_IR_RAW; + data->dev->driver_name = WBCIR_NAME; + data->dev->input_name = WBCIR_NAME; + data->dev->input_phys = "wbcir/cir0"; diff --git a/queue-3.0/series b/queue-3.0/series index 82ab2db56f6..df27703e0b2 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -10,3 +10,5 @@ usb-yurex-fix-missing-urb_no_transfer_dma_map-flag-in-urb.patch uwb-fix-use-of-del_timer_sync-in-interrupt.patch uwb-fix-error-handling.patch davinci_mdio-fix-mdio-timeout-check.patch +media-rc-core-set-mode-for-winbond-cir.patch +cfg80211-fix-interface-combinations-check.patch -- 2.47.3