diff options
| author | John W. Linville <linville@tuxdriver.com> | 2015-12-14 09:15:55 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2015-12-14 09:15:55 -0500 |
| commit | 5454a47cfcc1ee32ef13bf8e4e6788ecac00f94c (patch) | |
| tree | 45f3c424b406898dd555e87fb77f6ab44447c601 | |
| parent | b4fadc520491b38bd7b45006c6e864a62c2df276 (diff) | |
| parent | b7bb110008607a915298bf0f47d25886ecb94477 (diff) | |
| download | wireless-testing-5454a47cfcc1ee32ef13bf8e4e6788ecac00f94c.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
| -rw-r--r-- | net/rfkill/core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/rfkill/core.c b/net/rfkill/core.c index b41e9ea2ffff46..f53bf3b6558b09 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -49,7 +49,6 @@ struct rfkill { spinlock_t lock; - const char *name; enum rfkill_type type; unsigned long state; @@ -73,6 +72,7 @@ struct rfkill { struct delayed_work poll_work; struct work_struct uevent_work; struct work_struct sync_work; + char name[]; }; #define to_rfkill(d) container_of(d, struct rfkill, dev) @@ -876,14 +876,14 @@ struct rfkill * __must_check rfkill_alloc(const char *name, if (WARN_ON(type == RFKILL_TYPE_ALL || type >= NUM_RFKILL_TYPES)) return NULL; - rfkill = kzalloc(sizeof(*rfkill), GFP_KERNEL); + rfkill = kzalloc(sizeof(*rfkill) + strlen(name) + 1, GFP_KERNEL); if (!rfkill) return NULL; spin_lock_init(&rfkill->lock); INIT_LIST_HEAD(&rfkill->node); rfkill->type = type; - rfkill->name = name; + strcpy(rfkill->name, name); rfkill->ops = ops; rfkill->data = ops_data; |