diff --git a/[refs] b/[refs] index d0aa746701d2..3d63cca057d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f03900d696079fa1e93c91af0e49c55b9b7dd105 +refs/heads/master: 5f6e3c8e34bc02800b499e09828ac1061e004977 diff --git a/trunk/drivers/media/IR/imon.c b/trunk/drivers/media/IR/imon.c index 9ca5e864d16f..d5d8d9331870 100644 --- a/trunk/drivers/media/IR/imon.c +++ b/trunk/drivers/media/IR/imon.c @@ -1671,7 +1671,7 @@ static struct input_dev *imon_init_idev(struct imon_context *ictx) } ir = kzalloc(sizeof(struct ir_input_dev), GFP_KERNEL); - if (!props) { + if (!ir) { dev_err(ictx->dev, "remote ir input dev allocation failed\n"); goto ir_dev_alloc_failed; }