diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-29 20:12:13 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-29 20:12:13 +1000 |
| commit | db835e5c572c05a44a289832f2adceca384bbfeb (patch) | |
| tree | ebed2397e2de493928de11fb960d1eca77b9e102 /drivers/misc | |
| parent | 831a89659673adee7e0558eef2ae5ac88bbb7d14 (diff) | |
| parent | 76e1488440013a0d737fbb9d1f8efe226138f7f0 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/arm64/Kconfig
mm/shmem.c
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/ti-st/st_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c index 1972d57aadb3..e7fbc08a0627 100644 --- a/drivers/misc/ti-st/st_core.c +++ b/drivers/misc/ti-st/st_core.c @@ -342,7 +342,7 @@ void st_int_recv(void *disc_data, /* Unknow packet? */ default: type = *ptr; - if (st_gdata->list[type] == NULL) { + if (type >= ST_MAX_CHANNELS || st_gdata->list[type] == NULL) { pr_err("chip/interface misbehavior dropping" " frame starting with 0x%02x", type); goto done; |