* [PATCH] ALSA:usb-audio:check urb before kill it
@ 2020-12-27 13:04 ` Defang Bo
0 siblings, 0 replies; 5+ messages in thread
From: Defang Bo @ 2020-12-27 13:04 UTC (permalink / raw)
To: perex, tiwai; +Cc: tom.ty89, kai.heng.feng, alsa-devel, linux-kernel, Defang Bo
Similar to commit<124751d5e>, there should be a check for urb before kill it.
Signed-off-by: Defang Bo <bodefang@126.com>
---
sound/usb/mixer.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 81e987e..0223ef3 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -3589,8 +3589,10 @@ void snd_usb_mixer_disconnect(struct usb_mixer_interface *mixer)
/* stop any bus activity of a mixer */
static void snd_usb_mixer_inactivate(struct usb_mixer_interface *mixer)
{
- usb_kill_urb(mixer->urb);
- usb_kill_urb(mixer->rc_urb);
+ if (mixer->urb)
+ usb_kill_urb(mixer->urb);
+ if (mixer->rc_urb)
+ usb_kill_urb(mixer->rc_urb);
}
static int snd_usb_mixer_activate(struct usb_mixer_interface *mixer)
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] ALSA:usb-audio:check urb before kill it
@ 2020-12-27 13:04 ` Defang Bo
0 siblings, 0 replies; 5+ messages in thread
From: Defang Bo @ 2020-12-27 13:04 UTC (permalink / raw)
To: perex, tiwai; +Cc: alsa-devel, kai.heng.feng, linux-kernel, Defang Bo, tom.ty89
Similar to commit<124751d5e>, there should be a check for urb before kill it.
Signed-off-by: Defang Bo <bodefang@126.com>
---
sound/usb/mixer.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 81e987e..0223ef3 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -3589,8 +3589,10 @@ void snd_usb_mixer_disconnect(struct usb_mixer_interface *mixer)
/* stop any bus activity of a mixer */
static void snd_usb_mixer_inactivate(struct usb_mixer_interface *mixer)
{
- usb_kill_urb(mixer->urb);
- usb_kill_urb(mixer->rc_urb);
+ if (mixer->urb)
+ usb_kill_urb(mixer->urb);
+ if (mixer->rc_urb)
+ usb_kill_urb(mixer->rc_urb);
}
static int snd_usb_mixer_activate(struct usb_mixer_interface *mixer)
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] ALSA: usb-audio: check urb before kill it
2020-12-27 13:04 ` Defang Bo
(?)
@ 2020-12-28 11:28 ` Markus Elfring
-1 siblings, 0 replies; 5+ messages in thread
From: Markus Elfring @ 2020-12-28 11:28 UTC (permalink / raw)
To: Defang Bo, alsa-devel
Cc: kernel-janitors, Takashi Iwai, linux-kernel, Kai-Heng Feng, Tom Yan
> Similar to commit<124751d5e>, there should be a check for urb before kill it.
I suggest to reconsider this change description.
How does it fit to the information “may be NULL” from the function documentation?
https://elixir.bootlin.com/linux/v5.10.3/source/drivers/usb/core/urb.c#L677
Regards,
Markus
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ALSA:usb-audio:check urb before kill it
2020-12-27 13:04 ` Defang Bo
@ 2020-12-29 8:25 ` Takashi Iwai
-1 siblings, 0 replies; 5+ messages in thread
From: Takashi Iwai @ 2020-12-29 8:25 UTC (permalink / raw)
To: Defang Bo; +Cc: perex, tiwai, tom.ty89, kai.heng.feng, alsa-devel, linux-kernel
On Sun, 27 Dec 2020 14:04:59 +0100,
Defang Bo wrote:
>
> Similar to commit<124751d5e>, there should be a check for urb before kill it.
>
> Signed-off-by: Defang Bo <bodefang@126.com>
usb_kill_urb() accepts the NULL urb pointer, so the NULL check in the
caller side is basically superfluous.
thanks,
Takashi
> ---
> sound/usb/mixer.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
> index 81e987e..0223ef3 100644
> --- a/sound/usb/mixer.c
> +++ b/sound/usb/mixer.c
> @@ -3589,8 +3589,10 @@ void snd_usb_mixer_disconnect(struct usb_mixer_interface *mixer)
> /* stop any bus activity of a mixer */
> static void snd_usb_mixer_inactivate(struct usb_mixer_interface *mixer)
> {
> - usb_kill_urb(mixer->urb);
> - usb_kill_urb(mixer->rc_urb);
> + if (mixer->urb)
> + usb_kill_urb(mixer->urb);
> + if (mixer->rc_urb)
> + usb_kill_urb(mixer->rc_urb);
> }
>
> static int snd_usb_mixer_activate(struct usb_mixer_interface *mixer)
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ALSA:usb-audio:check urb before kill it
@ 2020-12-29 8:25 ` Takashi Iwai
0 siblings, 0 replies; 5+ messages in thread
From: Takashi Iwai @ 2020-12-29 8:25 UTC (permalink / raw)
To: Defang Bo; +Cc: alsa-devel, tiwai, linux-kernel, tom.ty89, kai.heng.feng
On Sun, 27 Dec 2020 14:04:59 +0100,
Defang Bo wrote:
>
> Similar to commit<124751d5e>, there should be a check for urb before kill it.
>
> Signed-off-by: Defang Bo <bodefang@126.com>
usb_kill_urb() accepts the NULL urb pointer, so the NULL check in the
caller side is basically superfluous.
thanks,
Takashi
> ---
> sound/usb/mixer.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
> index 81e987e..0223ef3 100644
> --- a/sound/usb/mixer.c
> +++ b/sound/usb/mixer.c
> @@ -3589,8 +3589,10 @@ void snd_usb_mixer_disconnect(struct usb_mixer_interface *mixer)
> /* stop any bus activity of a mixer */
> static void snd_usb_mixer_inactivate(struct usb_mixer_interface *mixer)
> {
> - usb_kill_urb(mixer->urb);
> - usb_kill_urb(mixer->rc_urb);
> + if (mixer->urb)
> + usb_kill_urb(mixer->urb);
> + if (mixer->rc_urb)
> + usb_kill_urb(mixer->rc_urb);
> }
>
> static int snd_usb_mixer_activate(struct usb_mixer_interface *mixer)
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-12-29 8:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-27 13:04 [PATCH] ALSA:usb-audio:check urb before kill it Defang Bo
2020-12-27 13:04 ` Defang Bo
2020-12-28 11:28 ` [PATCH] ALSA: usb-audio: check " Markus Elfring
2020-12-29 8:25 ` [PATCH] ALSA:usb-audio:check " Takashi Iwai
2020-12-29 8:25 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.