projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
[firefly-linux-kernel-4.4.55.git]
/
net
/
rfkill
/
core.c
diff --git
a/net/rfkill/core.c
b/net/rfkill/core.c
index b41e9ea2ffff461847465d621a3284480f433cc5..d778d99326df703a29df879bdea95253382a9c7a 100644
(file)
--- a/
net/rfkill/core.c
+++ b/
net/rfkill/core.c
@@
-49,7
+49,6
@@
struct rfkill {
spinlock_t lock;
struct rfkill {
spinlock_t lock;
- const char *name;
enum rfkill_type type;
unsigned long state;
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;
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)
};
#define to_rfkill(d) container_of(d, struct rfkill, dev)
@@
-802,7
+802,7
@@
void rfkill_resume_polling(struct rfkill *rfkill)
}
EXPORT_SYMBOL(rfkill_resume_polling);
}
EXPORT_SYMBOL(rfkill_resume_polling);
-#ifdef CONFIG_
PM_SLEEP
+#ifdef CONFIG_
RFKILL_PM
static int rfkill_suspend(struct device *dev)
{
struct rfkill *rfkill = to_rfkill(dev);
static int rfkill_suspend(struct device *dev)
{
struct rfkill *rfkill = to_rfkill(dev);
@@
-838,7
+838,9
@@
static struct class rfkill_class = {
.dev_release = rfkill_release,
.dev_groups = rfkill_dev_groups,
.dev_uevent = rfkill_dev_uevent,
.dev_release = rfkill_release,
.dev_groups = rfkill_dev_groups,
.dev_uevent = rfkill_dev_uevent,
+#ifdef CONFIG_RFKILL_PM
.pm = RFKILL_PM_OPS,
.pm = RFKILL_PM_OPS,
+#endif
};
bool rfkill_blocked(struct rfkill *rfkill)
};
bool rfkill_blocked(struct rfkill *rfkill)
@@
-876,14
+878,14
@@
struct rfkill * __must_check rfkill_alloc(const char *name,
if (WARN_ON(type == RFKILL_TYPE_ALL || type >= NUM_RFKILL_TYPES))
return NULL;
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;
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;
rfkill->ops = ops;
rfkill->data = ops_data;
@@
-1095,17
+1097,6
@@
static unsigned int rfkill_fop_poll(struct file *file, poll_table *wait)
return res;
}
return res;
}
-static bool rfkill_readable(struct rfkill_data *data)
-{
- bool r;
-
- mutex_lock(&data->mtx);
- r = !list_empty(&data->events);
- mutex_unlock(&data->mtx);
-
- return r;
-}
-
static ssize_t rfkill_fop_read(struct file *file, char __user *buf,
size_t count, loff_t *pos)
{
static ssize_t rfkill_fop_read(struct file *file, char __user *buf,
size_t count, loff_t *pos)
{
@@
-1122,8
+1113,11
@@
static ssize_t rfkill_fop_read(struct file *file, char __user *buf,
goto out;
}
mutex_unlock(&data->mtx);
goto out;
}
mutex_unlock(&data->mtx);
+ /* since we re-check and it just compares pointers,
+ * using !list_empty() without locking isn't a problem
+ */
ret = wait_event_interruptible(data->read_wait,
ret = wait_event_interruptible(data->read_wait,
-
rfkill_readable(data
));
+
!list_empty(&data->events
));
mutex_lock(&data->mtx);
if (ret)
mutex_lock(&data->mtx);
if (ret)