From 891dcb058c768ab61c5af61aae7ee34f981f406d Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Thu, 12 Jul 2012 23:50:43 +0200 Subject: [PATCH] --- yaml --- r: 317992 b: refs/heads/master c: 626888df7fc7ed26d1e7edfdea3f6c85912175fc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e2b6ca491ea6..03c82477d273 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 949f5a505cb19248a941d404fd64d2e37a87a059 +refs/heads/master: 626888df7fc7ed26d1e7edfdea3f6c85912175fc diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c index e8c4a4e5ac6d..b2ecd0e6780e 100644 --- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c +++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c @@ -70,7 +70,7 @@ static int ft1000_probe(struct usb_interface *interface, ft1000dev = kzalloc(sizeof(struct ft1000_device), GFP_KERNEL); if (!ft1000dev) { - printk(KERN_ERR "out of memory allocating device structure\n"); + pr_err("out of memory allocating device structure\n"); return -ENOMEM; } @@ -138,7 +138,7 @@ static int ft1000_probe(struct usb_interface *interface, ret = request_firmware(&dsp_fw, "ft3000.img", &dev->dev); if (ret < 0) { - printk(KERN_ERR "Error request_firmware().\n"); + pr_err("Error request_firmware().\n"); goto err_fw; } @@ -166,7 +166,7 @@ static int ft1000_probe(struct usb_interface *interface, DEBUG("In probe: pft1000info=%p\n", pft1000info); ret = dsp_reload(ft1000dev); if (ret) { - printk(KERN_ERR "Problem with DSP image loading\n"); + pr_err("Problem with DSP image loading\n"); goto err_load; }