diff options
| author | Anton Vorontsov <avorontsov@mvista.com> | 2010-05-14 18:33:18 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-05 11:15:42 -0700 |
| commit | 0b1187ee5f3b8298062a69d9e1e45ebc4773640a (patch) | |
| tree | 9a32dcbe68183c06ce87e3777d106484953ebd76 /drivers | |
| parent | c39f3ce982273c2f259938647f572b1af6a81711 (diff) | |
| download | kernel-crypto-0b1187ee5f3b8298062a69d9e1e45ebc4773640a.tar.gz kernel-crypto-0b1187ee5f3b8298062a69d9e1e45ebc4773640a.tar.xz kernel-crypto-0b1187ee5f3b8298062a69d9e1e45ebc4773640a.zip | |
USB: FHCI: cq_get() should check kfifo_out()'s return value
commit 7f1cccd3ec8789e52897bc34420ca81a5e2edeab upstream.
Since commit 7acd72eb85f1c7a15e8b5eb554994949241737f1 ("kfifo: rename
kfifo_put... into kfifo_in... and kfifo_get... into kfifo_out..."),
kfifo_out() is marked __must_check, and that causes gcc to produce
lots of warnings like this:
CC drivers/usb/host/fhci-mem.o
In file included from drivers/usb/host/fhci-hcd.c:34:
drivers/usb/host/fhci.h: In function 'cq_get':
drivers/usb/host/fhci.h:520: warning: ignoring return value of 'kfifo_out', declared with attribute warn_unused_result
...
This patch fixes the issue by properly checking the return value.
Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/host/fhci.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/usb/host/fhci.h b/drivers/usb/host/fhci.h index 72dae1c5ab3..3b6e864fd80 100644 --- a/drivers/usb/host/fhci.h +++ b/drivers/usb/host/fhci.h @@ -20,6 +20,7 @@ #include <linux/kernel.h> #include <linux/types.h> +#include <linux/bug.h> #include <linux/spinlock.h> #include <linux/interrupt.h> #include <linux/kfifo.h> @@ -515,9 +516,13 @@ static inline int cq_put(struct kfifo *kfifo, void *p) static inline void *cq_get(struct kfifo *kfifo) { - void *p = NULL; + unsigned int sz; + void *p; + + sz = kfifo_out(kfifo, (void *)&p, sizeof(p)); + if (sz != sizeof(p)) + return NULL; - kfifo_out(kfifo, (void *)&p, sizeof(p)); return p; } |