]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
drivers-w1-slaves-w1_ds2408c-add-magic-sequence-to-disable-p0-test-mode-fix
authorAndrew Morton <akpm@linux-foundation.org>
Wed, 19 Jun 2013 00:08:40 +0000 (10:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 07:27:51 +0000 (17:27 +1000)
don't use kerenldoc token to introduce a non-kerneldoc comment, tweak whitespace

Cc: Evgeniy Polyakov <zbr@ioremap.net>
Cc: Greg KH <greg@kroah.com>
Cc: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/w1/slaves/w1_ds2408.c

index 01fe4483778fc06e0d254250702cf83ec2390d7a..cb8a8e5d957336db8d2934e8ed84f9756c3238f9 100644 (file)
@@ -302,7 +302,7 @@ error:
        return -EIO;
 }
 
-/**
+/*
  * This is a special sequence we must do to ensure the P0 output is not stuck
  * in test mode. This is described in rev 2 of the ds2408's datasheet
  * (http://datasheets.maximintegrated.com/en/ds/DS2408.pdf) under
@@ -313,6 +313,7 @@ static int w1_f29_disable_test_mode(struct w1_slave *sl)
        int res;
        u8 magic[10] = {0x96, };
        u64 rn = le64_to_cpu(*((u64*)&sl->reg_num));
+
        memcpy(&magic[1], &rn, 8);
        magic[9] = 0x3C;