Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[~andy/linux] / drivers / uwb / lc-rc.c

diff --git a/drivers/uwb/lc-rc.c b/drivers/uwb/lc-rc.c
index a21c96bff236c3817011bc1b6eae1db8e5fdf31e..ee5772f00d4269e6eca5c2125a3701360880824a 100644 (file)
--- a/drivers/uwb/lc-rc.c
+++ b/drivers/uwb/lc-rc.c
@@ -211,12 +211,6 @@ static int uwb_rc_setup(struct uwb_rc *rc)
                dev_err(dev, "cannot setup IE subsystem: %d\n", result);
                goto error_ie_setup;
        }
-       result = uwb_rc_set_identification_ie(rc);
-       if (result < 0) {
-               dev_err(dev, "cannot set Identification IE: %d\n",
-                       result);
-               goto error_set_id_ie;
-       }
        result = uwb_rsv_setup(rc);
        if (result < 0) {
                dev_err(dev, "cannot setup reservation subsystem: %d\n", result);