diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-04 20:36:51 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-04 20:36:51 +1000 |
| commit | a4545c61a6ecdcd609c7f16f0169708ee3e8a95c (patch) | |
| tree | 7e06da4480cef9b31a66ccb672db147cf9a2af3c /drivers/misc | |
| parent | 27d6e5ca9c32fcce8d710e02fc0022eb36a8ae48 (diff) | |
| parent | 929c76e4e6292770322822a50e08b8feaa4afbbf (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/arm64/Kconfig
drivers/rapidio/devices/tsi721_dma.c
kernel/kexec.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; |