diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-04-22 09:31:43 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-22 09:31:43 -0400 |
commit | a42c74ee608a424342ef7069ccddf196d873040c (patch) | |
tree | 75adfb9f5e06ebb7c7d5d5e5a5408fa0d6d504b9 /drivers/ssb/embedded.c | |
parent | 97990a060e6757f48b931a3946b17c1c4362c3fb (diff) | |
parent | 9b383672452bb1097124c76fcb4903e0021f6baf (diff) |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'drivers/ssb/embedded.c')
-rw-r--r-- | drivers/ssb/embedded.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ssb/embedded.c b/drivers/ssb/embedded.c index bb18d76f9f2c..55e101115038 100644 --- a/drivers/ssb/embedded.c +++ b/drivers/ssb/embedded.c | |||
@@ -57,9 +57,8 @@ int ssb_watchdog_register(struct ssb_bus *bus) | |||
57 | bus->busnumber, &wdt, | 57 | bus->busnumber, &wdt, |
58 | sizeof(wdt)); | 58 | sizeof(wdt)); |
59 | if (IS_ERR(pdev)) { | 59 | if (IS_ERR(pdev)) { |
60 | ssb_dprintk(KERN_INFO PFX | 60 | ssb_dbg("can not register watchdog device, err: %li\n", |
61 | "can not register watchdog device, err: %li\n", | 61 | PTR_ERR(pdev)); |
62 | PTR_ERR(pdev)); | ||
63 | return PTR_ERR(pdev); | 62 | return PTR_ERR(pdev); |
64 | } | 63 | } |
65 | 64 | ||