diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/scsi/scsi_netlink.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/scsi/scsi_netlink.c')
| -rw-r--r-- | drivers/scsi/scsi_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c index a2ed201885ae..26a8a45584ef 100644 --- a/drivers/scsi/scsi_netlink.c +++ b/drivers/scsi/scsi_netlink.c | |||
| @@ -499,7 +499,7 @@ scsi_netlink_init(void) | |||
| 499 | SCSI_NL_GRP_CNT, scsi_nl_rcv_msg, NULL, | 499 | SCSI_NL_GRP_CNT, scsi_nl_rcv_msg, NULL, |
| 500 | THIS_MODULE); | 500 | THIS_MODULE); |
| 501 | if (!scsi_nl_sock) { | 501 | if (!scsi_nl_sock) { |
| 502 | printk(KERN_ERR "%s: register of recieve handler failed\n", | 502 | printk(KERN_ERR "%s: register of receive handler failed\n", |
| 503 | __func__); | 503 | __func__); |
| 504 | netlink_unregister_notifier(&scsi_netlink_notifier); | 504 | netlink_unregister_notifier(&scsi_netlink_notifier); |
| 505 | return; | 505 | return; |