diff --git a/[refs] b/[refs] index 9cff04209c13..d224237a4dd5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fe70ba2272c123cf38e4c577bf220f8bcf25366 +refs/heads/master: 8ac283ad415358f022498887811c35ac656b5222 diff --git a/trunk/drivers/usb/serial/aircable.c b/trunk/drivers/usb/serial/aircable.c index 8aaf7db93992..2ccd9ded52a5 100644 --- a/trunk/drivers/usb/serial/aircable.c +++ b/trunk/drivers/usb/serial/aircable.c @@ -218,7 +218,7 @@ static void aircable_send(struct usb_serial_port *port) buf = kzalloc(count + HCI_HEADER_LENGTH, GFP_ATOMIC); if (!buf) { - err("%s- kzalloc(%Zd) failed.", __FUNCTION__, + err("%s- kzalloc(%d) failed.", __FUNCTION__, count + HCI_HEADER_LENGTH); return; } @@ -280,7 +280,7 @@ static void aircable_read(void *params) tty_prepare_flip_string(tty, &data, count); if (!data){ - err("%s- kzalloc(%Zd) failed.", __FUNCTION__, count); + err("%s- kzalloc(%d) failed.", __FUNCTION__, count); return; }