]> 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>
Thu, 9 May 2013 23:57:51 +0000 (09:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 May 2013 04:18:00 +0000 (14:18 +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 3fc1b38a8151dd2d93202266071885d10a4de188..dbe7e45dc38f15bd8923143fd8762ce6793ba98a 100644 (file)
@@ -301,7 +301,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
@@ -312,6 +312,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;