Commit ff3b968c authored by Julia Lawall's avatar Julia Lawall Committed by Greg Kroah-Hartman

USB: gadget: Use ERR_PTR/IS_ERR

Use ERR_PTR and IS_ERR rather than mixing integers and pointers.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression *E;
@@

* E < 0
// </smpl>
Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent da307123
...@@ -252,12 +252,12 @@ static struct f_audio_buf *f_audio_buffer_alloc(int buf_size) ...@@ -252,12 +252,12 @@ static struct f_audio_buf *f_audio_buffer_alloc(int buf_size)
copy_buf = kzalloc(sizeof *copy_buf, GFP_ATOMIC); copy_buf = kzalloc(sizeof *copy_buf, GFP_ATOMIC);
if (!copy_buf) if (!copy_buf)
return (struct f_audio_buf *)-ENOMEM; return ERR_PTR(-ENOMEM);
copy_buf->buf = kzalloc(buf_size, GFP_ATOMIC); copy_buf->buf = kzalloc(buf_size, GFP_ATOMIC);
if (!copy_buf->buf) { if (!copy_buf->buf) {
kfree(copy_buf); kfree(copy_buf);
return (struct f_audio_buf *)-ENOMEM; return ERR_PTR(-ENOMEM);
} }
return copy_buf; return copy_buf;
...@@ -332,7 +332,7 @@ static int f_audio_out_ep_complete(struct usb_ep *ep, struct usb_request *req) ...@@ -332,7 +332,7 @@ static int f_audio_out_ep_complete(struct usb_ep *ep, struct usb_request *req)
list_add_tail(&copy_buf->list, &audio->play_queue); list_add_tail(&copy_buf->list, &audio->play_queue);
schedule_work(&audio->playback_work); schedule_work(&audio->playback_work);
copy_buf = f_audio_buffer_alloc(audio_buf_size); copy_buf = f_audio_buffer_alloc(audio_buf_size);
if (copy_buf < 0) if (IS_ERR(copy_buf))
return -ENOMEM; return -ENOMEM;
} }
...@@ -576,6 +576,8 @@ static int f_audio_set_alt(struct usb_function *f, unsigned intf, unsigned alt) ...@@ -576,6 +576,8 @@ static int f_audio_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
usb_ep_enable(out_ep, audio->out_desc); usb_ep_enable(out_ep, audio->out_desc);
out_ep->driver_data = audio; out_ep->driver_data = audio;
audio->copy_buf = f_audio_buffer_alloc(audio_buf_size); audio->copy_buf = f_audio_buffer_alloc(audio_buf_size);
if (IS_ERR(audio->copy_buf))
return -ENOMEM;
/* /*
* allocate a bunch of read buffers * allocate a bunch of read buffers
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment