Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304247
b: refs/heads/master
c: 2f3d2b4
h: refs/heads/master
i:
  304245: 5c083b9
  304243: 7665a02
  304239: b72ac01
v: v3
  • Loading branch information
Tomas Winkler authored and Greg Kroah-Hartman committed Apr 10, 2012
1 parent 724df55 commit 1c91eaf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4e24764017ee5dd9d7062e9c10af2c3c557f9c5a
refs/heads/master: 2f3d2b499b73b3aa05feba35a9b04c6eec1a50ec
8 changes: 5 additions & 3 deletions trunk/drivers/staging/mei/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
*
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/kernel.h>
Expand Down Expand Up @@ -1020,7 +1022,7 @@ static int __devinit mei_probe(struct pci_dev *pdev,

mutex_unlock(&mei_mutex);

pr_debug("mei: Driver initialization successful.\n");
pr_debug("initialization successful.\n");

return 0;

Expand Down Expand Up @@ -1204,7 +1206,7 @@ static int __init mei_init_module(void)
{
int ret;

pr_debug("mei: %s\n", mei_driver_string);
pr_debug("loading.\n");
/* init pci module */
ret = pci_register_driver(&mei_driver);
if (ret < 0)
Expand All @@ -1226,7 +1228,7 @@ static void __exit mei_exit_module(void)
misc_deregister(&mei_misc_device);
pci_unregister_driver(&mei_driver);

pr_debug("mei: Driver unloaded successfully.\n");
pr_debug("unloaded successfully.\n");
}

module_exit(mei_exit_module);
Expand Down

0 comments on commit 1c91eaf

Please sign in to comment.