diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 23:25:59 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 23:25:59 +0100 |
| commit | 1b79dff672ca09a5461cc1d46ad81c62137841c5 (patch) | |
| tree | 772a4224c78aa20862511ae5f7272f9311e4811c /drivers/misc | |
| parent | android: drivers: Avoid debugfs race in binder (diff) | |
| parent | Linux 4.5-rc4 (diff) | |
| download | linux-1b79dff672ca09a5461cc1d46ad81c62137841c5.tar.xz linux-1b79dff672ca09a5461cc1d46ad81c62137841c5.zip | |
Merge 4.5-rc4 into char-misc-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c index 05775a6f7c88..7e637eb46cb9 100644 --- a/drivers/misc/mei/main.c +++ b/drivers/misc/mei/main.c @@ -438,7 +438,11 @@ static int mei_ioctl_client_notify_request(const struct file *file, u32 request) { struct mei_cl *cl = file->private_data; - return mei_cl_notify_request(cl, file, request); + if (request != MEI_HBM_NOTIFICATION_START && + request != MEI_HBM_NOTIFICATION_STOP) + return -EINVAL; + + return mei_cl_notify_request(cl, file, (u8)request); } /** |