From d7fbfd11ebc84209990d5afd10b4b377bbcf6b8e Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 20 Aug 2012 15:05:23 -0700 Subject: [PATCH] --- yaml --- r: 324649 b: refs/heads/master c: 9ac6eb40510bf9e6e82435f78f5c1cb92ee3f97a h: refs/heads/master i: 324647: 6330ea30fe58de778fdeeaae1e68e2507f19d398 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/comedi_test.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 383f06b18306..501e9e34acd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1da49430bb2e78616769623638f869c513e6ec1 +refs/heads/master: 9ac6eb40510bf9e6e82435f78f5c1cb92ee3f97a diff --git a/trunk/drivers/staging/comedi/drivers/comedi_test.c b/trunk/drivers/staging/comedi/drivers/comedi_test.c index 68647165f8f9..8ea9202ecba7 100644 --- a/trunk/drivers/staging/comedi/drivers/comedi_test.c +++ b/trunk/drivers/staging/comedi/drivers/comedi_test.c @@ -489,10 +489,12 @@ static int waveform_attach(struct comedi_device *dev, devpriv->timer.function = waveform_ai_interrupt; devpriv->timer.data = (unsigned long)dev; - printk(KERN_INFO "comedi%d: comedi_test: " - "%i microvolt, %li microsecond waveform attached\n", dev->minor, - devpriv->uvolt_amplitude, devpriv->usec_period); - return 1; + dev_info(dev->class_dev, + "%s: %i microvolt, %li microsecond waveform attached\n", + dev->board_name, + devpriv->uvolt_amplitude, devpriv->usec_period); + + return 0; } static void waveform_detach(struct comedi_device *dev)