Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / line6 / midi.c

diff --git a/drivers/staging/line6/midi.c b/drivers/staging/line6/midi.c
index ab67e889d2c4b53f14f0488d96e3749de08565c7..e554a2da643a6dcc07582a66a8e0de99ccc0a90b 100644 (file)
--- a/drivers/staging/line6/midi.c
+++ b/drivers/staging/line6/midi.c
@@ -127,7 +127,7 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data,
 
        urb = usb_alloc_urb(0, GFP_ATOMIC);
 
-       if (urb == 0) {
+       if (urb == NULL) {
                dev_err(line6->ifcdev, "Out of memory\n");
                return -ENOMEM;
        }
@@ -137,7 +137,7 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data,
 
        transfer_buffer = kmalloc(length, GFP_ATOMIC);
 
-       if (transfer_buffer == 0) {
+       if (transfer_buffer == NULL) {
                usb_free_urb(urb);
                dev_err(line6->ifcdev, "Out of memory\n");
                return -ENOMEM;