linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] soc_button_array: fix a crash during rmmod
       [not found] <53560DD1.5050805@linux.intel.com>
@ 2014-04-22  6:38 ` Zhu, Lejun
  2014-04-23  5:53   ` Dmitry Torokhov
  0 siblings, 1 reply; 2+ messages in thread
From: Zhu, Lejun @ 2014-04-22  6:38 UTC (permalink / raw)
  To: Dmitry Torokhov; +Cc: linux-input, linux-kernel

When the system has zero or one button available, trying to rmmod
soc_button_array will cause crash. Fix this by properly handling -ENODEV
in probe().

Signed-off-by: Lejun Zhu <lejun.zhu@linux.intel.com>
---
 drivers/input/misc/soc_button_array.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/input/misc/soc_button_array.c
b/drivers/input/misc/soc_button_array.c
index 08ead2a..20c80f5 100644
--- a/drivers/input/misc/soc_button_array.c
+++ b/drivers/input/misc/soc_button_array.c
@@ -169,6 +169,7 @@ static int soc_button_pnp_probe(struct pnp_dev *pdev,
 				soc_button_remove(pdev);
 				return error;
 			}
+			continue;
 		}

 		priv->children[i] = pd;
-- 
1.8.3.2




















^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] soc_button_array: fix a crash during rmmod
  2014-04-22  6:38 ` [PATCH] soc_button_array: fix a crash during rmmod Zhu, Lejun
@ 2014-04-23  5:53   ` Dmitry Torokhov
  0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2014-04-23  5:53 UTC (permalink / raw)
  To: Zhu, Lejun; +Cc: linux-input, linux-kernel

On Tue, Apr 22, 2014 at 02:38:39PM +0800, Zhu, Lejun wrote:
> When the system has zero or one button available, trying to rmmod
> soc_button_array will cause crash. Fix this by properly handling -ENODEV
> in probe().
> 
> Signed-off-by: Lejun Zhu <lejun.zhu@linux.intel.com>

Applied, thank you.

> ---
>  drivers/input/misc/soc_button_array.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/input/misc/soc_button_array.c
> b/drivers/input/misc/soc_button_array.c
> index 08ead2a..20c80f5 100644
> --- a/drivers/input/misc/soc_button_array.c
> +++ b/drivers/input/misc/soc_button_array.c
> @@ -169,6 +169,7 @@ static int soc_button_pnp_probe(struct pnp_dev *pdev,
>  				soc_button_remove(pdev);
>  				return error;
>  			}
> +			continue;
>  		}
> 
>  		priv->children[i] = pd;
> -- 
> 1.8.3.2
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 

-- 
Dmitry

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-04-23  5:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <53560DD1.5050805@linux.intel.com>
2014-04-22  6:38 ` [PATCH] soc_button_array: fix a crash during rmmod Zhu, Lejun
2014-04-23  5:53   ` Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).