From bdb12e5c71be962a2ac913f0f328e7acab832faa Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 25 Apr 2012 14:48:57 -0700 Subject: [PATCH] --- yaml --- r: 303633 b: refs/heads/master c: 8048926bb898730b41c4c2698e9aefb16870488c h: refs/heads/master i: 303631: ee020848ea3213e2392b11480773d5cb1d19ca7a v: v3 --- [refs] | 2 +- trunk/drivers/staging/media/as102/as102_usb_drv.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 52f37aa387e3..08311e530461 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24c0328663623e1d10d7cc325f742b8d93b177ea +refs/heads/master: 8048926bb898730b41c4c2698e9aefb16870488c diff --git a/trunk/drivers/staging/media/as102/as102_usb_drv.c b/trunk/drivers/staging/media/as102/as102_usb_drv.c index 0f6bfe7eccba..6875c88e7bec 100644 --- a/trunk/drivers/staging/media/as102/as102_usb_drv.c +++ b/trunk/drivers/staging/media/as102/as102_usb_drv.c @@ -375,7 +375,7 @@ static int as102_usb_probe(struct usb_interface *intf, as102_dev = kzalloc(sizeof(struct as102_dev_t), GFP_KERNEL); if (as102_dev == NULL) { - err("%s: kzalloc failed", __func__); + dev_err(&intf->dev, "%s: kzalloc failed\n", __func__); return -ENOMEM; } @@ -411,8 +411,9 @@ static int as102_usb_probe(struct usb_interface *intf, ret = usb_register_dev(intf, &as102_usb_class_driver); if (ret < 0) { /* something prevented us from registering this driver */ - err("%s: usb_register_dev() failed (errno = %d)", - __func__, ret); + dev_err(&intf->dev, + "%s: usb_register_dev() failed (errno = %d)\n", + __func__, ret); goto failed; }