Browse Source

[Bluetooth] Kill redundant NULL checks before kfree()

There's no need to check for NULL before calling kfree() on a pointer.

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Marcel Holtmann 20 years ago
parent
commit
e9a3e671c0
2 changed files with 4 additions and 9 deletions
  1. 2 5
      drivers/bluetooth/bpa10x.c
  2. 2 4
      drivers/bluetooth/hci_usb.c

+ 2 - 5
drivers/bluetooth/bpa10x.c

@@ -367,11 +367,8 @@ static inline void bpa10x_free_urb(struct urb *urb)
 	if (!urb)
 	if (!urb)
 		return;
 		return;
 
 
-	if (urb->setup_packet)
-		kfree(urb->setup_packet);
-
-	if (urb->transfer_buffer)
-		kfree(urb->transfer_buffer);
+	kfree(urb->setup_packet);
+	kfree(urb->transfer_buffer);
 
 
 	usb_free_urb(urb);
 	usb_free_urb(urb);
 }
 }

+ 2 - 4
drivers/bluetooth/hci_usb.c

@@ -390,10 +390,8 @@ static void hci_usb_unlink_urbs(struct hci_usb *husb)
 			urb = &_urb->urb;
 			urb = &_urb->urb;
 			BT_DBG("%s freeing _urb %p type %d urb %p",
 			BT_DBG("%s freeing _urb %p type %d urb %p",
 					husb->hdev->name, _urb, _urb->type, urb);
 					husb->hdev->name, _urb, _urb->type, urb);
-			if (urb->setup_packet)
-				kfree(urb->setup_packet);
-			if (urb->transfer_buffer)
-				kfree(urb->transfer_buffer);
+			kfree(urb->setup_packet);
+			kfree(urb->transfer_buffer);
 			_urb_free(_urb);
 			_urb_free(_urb);
 		}
 		}