Browse Source

USB: FHCI: Fix build after kfifo rework

After kfifo rework FHCI fails to build:

  CC      drivers/usb/host/fhci-tds.o
drivers/usb/host/fhci-tds.c: In function 'fhci_ep0_free':
drivers/usb/host/fhci-tds.c:108: error: used struct type value where scalar is required
drivers/usb/host/fhci-tds.c:118: error: used struct type value where scalar is required
drivers/usb/host/fhci-tds.c:128: error: used struct type value where scalar is required

This is because kfifos are no longer pointers in the ep struct.
So, instead of checking the pointers, we should now check if kfifo
is initialized.

Reported-by: Josh Boyer <jwboyer@gmail.com>
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Stefani Seibold <stefani@seibold.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Anton Vorontsov 15 years ago
parent
commit
4c743d0ae6
1 changed files with 3 additions and 3 deletions
  1. 3 3
      drivers/usb/host/fhci-tds.c

+ 3 - 3
drivers/usb/host/fhci-tds.c

@@ -105,7 +105,7 @@ void fhci_ep0_free(struct fhci_usb *usb)
 		if (ep->td_base)
 		if (ep->td_base)
 			cpm_muram_free(cpm_muram_offset(ep->td_base));
 			cpm_muram_free(cpm_muram_offset(ep->td_base));
 
 
-		if (ep->conf_frame_Q) {
+		if (kfifo_initialized(&ep->conf_frame_Q)) {
 			size = cq_howmany(&ep->conf_frame_Q);
 			size = cq_howmany(&ep->conf_frame_Q);
 			for (; size; size--) {
 			for (; size; size--) {
 				struct packet *pkt = cq_get(&ep->conf_frame_Q);
 				struct packet *pkt = cq_get(&ep->conf_frame_Q);
@@ -115,7 +115,7 @@ void fhci_ep0_free(struct fhci_usb *usb)
 			cq_delete(&ep->conf_frame_Q);
 			cq_delete(&ep->conf_frame_Q);
 		}
 		}
 
 
-		if (ep->empty_frame_Q) {
+		if (kfifo_initialized(&ep->empty_frame_Q)) {
 			size = cq_howmany(&ep->empty_frame_Q);
 			size = cq_howmany(&ep->empty_frame_Q);
 			for (; size; size--) {
 			for (; size; size--) {
 				struct packet *pkt = cq_get(&ep->empty_frame_Q);
 				struct packet *pkt = cq_get(&ep->empty_frame_Q);
@@ -125,7 +125,7 @@ void fhci_ep0_free(struct fhci_usb *usb)
 			cq_delete(&ep->empty_frame_Q);
 			cq_delete(&ep->empty_frame_Q);
 		}
 		}
 
 
-		if (ep->dummy_packets_Q) {
+		if (kfifo_initialized(&ep->dummy_packets_Q)) {
 			size = cq_howmany(&ep->dummy_packets_Q);
 			size = cq_howmany(&ep->dummy_packets_Q);
 			for (; size; size--) {
 			for (; size; size--) {
 				u8 *buff = cq_get(&ep->dummy_packets_Q);
 				u8 *buff = cq_get(&ep->dummy_packets_Q);