2013-05-23 09:28:37

by Wei Yongjun

[permalink] [raw]
Subject: [PATCH -next] staging: keucr: remove needless check before usb_free_coherent()

From: Wei Yongjun <[email protected]>

usb_free_coherent() is safe with NULL addr and this check is
not required.

Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/staging/keucr/usb.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/keucr/usb.c b/drivers/staging/keucr/usb.c
index efadfcf..0608a5c 100644
--- a/drivers/staging/keucr/usb.c
+++ b/drivers/staging/keucr/usb.c
@@ -442,12 +442,9 @@ static void dissociate_dev(struct us_data *us)
kfree(us->sensebuf);

/* Free the device-related DMA-mapped buffers */
- if (us->cr)
- usb_free_coherent(us->pusb_dev, sizeof(*us->cr), us->cr,
- us->cr_dma);
- if (us->iobuf)
- usb_free_coherent(us->pusb_dev, US_IOBUF_SIZE, us->iobuf,
- us->iobuf_dma);
+ usb_free_coherent(us->pusb_dev, sizeof(*us->cr), us->cr, us->cr_dma);
+ usb_free_coherent(us->pusb_dev, US_IOBUF_SIZE, us->iobuf,
+ us->iobuf_dma);

/* Remove our private data from the interface */
usb_set_intfdata(us->pusb_intf, NULL);