mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
hwmon: (lis3) Fix Oops with NULL platform data
The recent addition of threaded irq handler causes a NULL dereference when used with hp_accel driver, which has NULL pdata. Acked-by: Samu Onkalo <samu.p.onkalo@nokia.com> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
This commit is contained in:
parent
a850ea3037
commit
f7c77a3dc4
1 changed files with 2 additions and 2 deletions
|
@ -277,7 +277,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *dummy)
|
|||
wake_up_interruptible(&lis3_dev.misc_wait);
|
||||
kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN);
|
||||
out:
|
||||
if (lis3_dev.whoami == WAI_8B && lis3_dev.idev &&
|
||||
if (lis3_dev.pdata && lis3_dev.whoami == WAI_8B && lis3_dev.idev &&
|
||||
lis3_dev.idev->input->users)
|
||||
return IRQ_WAKE_THREAD;
|
||||
return IRQ_HANDLED;
|
||||
|
@ -718,7 +718,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)
|
|||
* io-apic is not configurable (and generates a warning) but I keep it
|
||||
* in case of support for other hardware.
|
||||
*/
|
||||
if (dev->whoami == WAI_8B)
|
||||
if (dev->pdata && dev->whoami == WAI_8B)
|
||||
thread_fn = lis302dl_interrupt_thread1_8b;
|
||||
else
|
||||
thread_fn = NULL;
|
||||
|
|
Loading…
Reference in a new issue