diff --git a/[refs] b/[refs]
index 0ee2d7e9cc15..c4ff1dd14c55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffd3d5c6c7a20fb718daf98a6c8a476d228f3995
+refs/heads/master: 3d37fbe44112b06279efa04ad91a0e4b7a0c600c
diff --git a/trunk/sound/usb/caiaq/input.c b/trunk/sound/usb/caiaq/input.c
index a213813487bd..9efb92e4090d 100644
--- a/trunk/sound/usb/caiaq/input.c
+++ b/trunk/sound/usb/caiaq/input.c
@@ -664,15 +664,17 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
 	for (i = 0; i < input->keycodemax; i++)
 		__set_bit(dev->keycode[i], input->keybit);
 
+	dev->input_dev = input;
+
 	ret = input_register_device(input);
 	if (ret < 0)
 		goto exit_free_idev;
 
-	dev->input_dev = input;
 	return 0;
 
 exit_free_idev:
 	input_free_device(input);
+	dev->input_dev = NULL;
 	return ret;
 }