evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

USB: gadget: Use ERR_PTR/IS_ERR

Browse source 
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: Julia Lawall <julia@diku.dk>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Julia Lawall 2009-12-09 14:23:32 +01:00 • committed by Greg Kroah-Hartman
parent da307123c6
commit ff3b968cee
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/usb/gadget/f_audio.c
View file

@ -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)
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)
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