summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMarek Belisko <marek.belisko@open-nandra.com>2012-07-12 23:50:43 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-16 19:06:17 -0700
commit626888df7fc7ed26d1e7edfdea3f6c85912175fc (patch)
treecc7477daaad57fcce1cc9600689ff0e60d07afd9 /drivers
parent949f5a505cb19248a941d404fd64d2e37a87a059 (diff)
downloadlwn-626888df7fc7ed26d1e7edfdea3f6c85912175fc.tar.gz
lwn-626888df7fc7ed26d1e7edfdea3f6c85912175fc.zip
staging: ft1000-usb: Change KERN_ERROR usage to pr_err in ft1000_usb.c.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_usb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
index e8c4a4e5ac6d..b2ecd0e6780e 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
+++ b/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;
}