diff --git a/[refs] b/[refs]
index ad3c2f6895b9..5f58ca8ed12e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd79d33e168dba0d7de32c5bf010e20cff184b2a
+refs/heads/master: 0f7ff39532f1d2328e54b65ce5022c71f06e44d6
diff --git a/trunk/drivers/media/IR/ir-sysfs.c b/trunk/drivers/media/IR/ir-sysfs.c
index d67c11d9921f..6ec7f89d5142 100644
--- a/trunk/drivers/media/IR/ir-sysfs.c
+++ b/trunk/drivers/media/IR/ir-sysfs.c
@@ -97,7 +97,7 @@ static ssize_t store_protocol(struct device *d,
 		return -EINVAL;
 	}
 
-	if (ir_dev->props->change_protocol)
+	if (ir_dev->props && ir_dev->props->change_protocol)
 		rc = ir_dev->props->change_protocol(ir_dev->props->priv,
 						    ir_type);