diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-09 17:54:09 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-09 17:54:09 -0500 |
| commit | 3ed3c7b559f3cae7a5a92860a127ceb0cafd5a9c (patch) | |
| tree | c8ab8e608222f07edf46a42e6ec3cb27ac4ceaa0 /net/caif/cfcnfg.c | |
| parent | e470d06655e00749f6f9372e4fa4f20cea7ed7c5 (diff) | |
| parent | d020283dc694c9ec31b410f522252f7a8397e67d (diff) | |
Merge commit 'pm-fixes-for-3.3-rc3' into pm-sleep
New material in the pm-sleep branch depends on recent
power management fixes.
Diffstat (limited to 'net/caif/cfcnfg.c')
| -rw-r--r-- | net/caif/cfcnfg.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/caif/cfcnfg.c b/net/caif/cfcnfg.c index 598aafb4cb51..ba9cfd47778a 100644 --- a/net/caif/cfcnfg.c +++ b/net/caif/cfcnfg.c | |||
| @@ -309,7 +309,6 @@ int caif_connect_client(struct net *net, struct caif_connect_request *conn_req, | |||
| 309 | int err; | 309 | int err; |
| 310 | struct cfctrl_link_param param; | 310 | struct cfctrl_link_param param; |
| 311 | struct cfcnfg *cfg = get_cfcnfg(net); | 311 | struct cfcnfg *cfg = get_cfcnfg(net); |
| 312 | caif_assert(cfg != NULL); | ||
| 313 | 312 | ||
| 314 | rcu_read_lock(); | 313 | rcu_read_lock(); |
| 315 | err = caif_connect_req_to_link_param(cfg, conn_req, ¶m); | 314 | err = caif_connect_req_to_link_param(cfg, conn_req, ¶m); |