Message ID | 20141105081433.4f4003af@recife.lan (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c index 1ccf6262ab36..babd6470f246 100644 --- a/drivers/staging/media/lirc/lirc_zilog.c +++ b/drivers/staging/media/lirc/lirc_zilog.c @@ -1636,7 +1636,11 @@ out_put_xx: out_put_ir: put_ir_device(ir, true); out_no_ir: +<<<<<<< zilog_error("%s: probing IR %s on %s (i2c-%d) failed with %d\n", +======= + pr_err("%s: probing IR %s on %s (i2c-%d) failed with %d\n", +>>>>>>> __func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr, ret); mutex_unlock(&ir_devices_lock);