Re: [Nouveau] nouveau lockdep splat

2013-03-24 Thread Lijo Antony

On 03/20/2013 07:29 PM, Borislav Petkov wrote:

On Wed, Mar 20, 2013 at 07:23:19PM +0400, Lijo Antony wrote:

# bad: [fffddfd6c8e0c10c42c6e2cc54ba880fcc36ebbb] Merge branch
'drm-next' of git://people.freedesktop.org/~airlied/linux
git bisect bad fffddfd6c8e0c10c42c6e2cc54ba880fcc36ebbb


This is a merge commit which means something went wrong along the way of
the bisection.



Looks like this has been fixed in -rc4.

-lijo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [Nouveau] nouveau lockdep splat

2013-03-20 Thread Lijo Antony

On 03/20/2013 10:35 AM, Lijo Antony wrote:

I think this is same as https://lkml.org/lkml/2013/3/16/143 (btw, git
bisect in that mail is incorrect). While investigating, I found this
issue was introduced during 3.9 merge window. For me this comes when I
connect my TV via HDMI.


FWIW, git bisect gave this log,

git bisect start 'drivers/gpu/'
# good: [e450fcc6669705ef49784080ac6dd8513df37763] drm/tegra: Add list 
of framebuffers to debugfs

git bisect good e450fcc6669705ef49784080ac6dd8513df37763
# bad: [6dbe51c251a327e012439c4772097a13df43c5b8] Linux 3.9-rc1
git bisect bad 6dbe51c251a327e012439c4772097a13df43c5b8
# good: [bab588fcfb6335c767d811a8955979f5440328e0] Merge tag 'soc' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

git bisect good bab588fcfb6335c767d811a8955979f5440328e0
# good: [be88298b0a3f771a4802f20c5e66af74bfd1dff1] drm/tilcdc: only 
build on arm

git bisect good be88298b0a3f771a4802f20c5e66af74bfd1dff1
# bad: [4d53233a36fdda567cd4d080e27e1ee4b669ddd1] drm: don't use 
idr_remove_all()

git bisect bad 4d53233a36fdda567cd4d080e27e1ee4b669ddd1
# good: [9afa3195b96da7d2320ec44d19fbfbded7a15571] Merge branch 
'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

git bisect good 9afa3195b96da7d2320ec44d19fbfbded7a15571
# good: [496ad9aa8ef448058e36ca7a787c61f2e63f0f54] new helper: 
file_inode(file)

git bisect good 496ad9aa8ef448058e36ca7a787c61f2e63f0f54
# bad: [d895cb1af15c04c522a25c79cc429076987c089b] Merge branch 
'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

git bisect bad d895cb1af15c04c522a25c79cc429076987c089b
# bad: [fffddfd6c8e0c10c42c6e2cc54ba880fcc36ebbb] Merge branch 
'drm-next' of git://people.freedesktop.org/~airlied/linux

git bisect bad fffddfd6c8e0c10c42c6e2cc54ba880fcc36ebbb

-lijo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [Nouveau] nouveau lockdep splat

2013-03-19 Thread Lijo Antony

On 03/20/2013 12:40 AM, Peter Hurley wrote:


with the hope of having the right people on CC now (finally, thanks
Lucas :-)), here's the same splat on -rc3. Someone better take a look
soonish, please:


Also happens in next (on nv50 hardware).


I think this is same as https://lkml.org/lkml/2013/3/16/143 (btw, git 
bisect in that mail is incorrect). While investigating, I found this 
issue was introduced during 3.9 merge window. For me this comes when I 
connect my TV via HDMI. But for a couple of tags during bisecting, I 
have seen the same during boot also.


-lijo







--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [3.9.0-rc2] nouveau deadlock when HDMI TV is connected

2013-03-17 Thread Lijo Antony

On 03/16/2013 10:29 PM, Lijo Antony wrote:


But looking at 65b5f42e2a9eb9c8383fb67698bf8c27657f8c14, it looks I
might have done some mistake in bisecting.


My bisecting was indeed incorrect. Issue started even before 3.9.0-rc1.
Attempting a proper bisect this time...

-lijo

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: Fwd: [Nepomuk] Better support for (desktop) file search / indexing applications

2013-03-10 Thread Lijo Antony

On 03/10/2013 08:51 AM, Simeon Bird wrote:


Hi,

We (nepomuk) recently looked at using fanotify, and indeed we would
need user watches, support for moves and recursive directory watches
(we need to support the case where /home is not a separate filesystem)
before it would be useful to us. If you are interested in adding
these, we would be delighted to use nepomuk as a test-case for them.

We were wondering also if it would be possible to extend inotify a
little? Our wishlist is:

1) Recursive folder watches
2) When a file moves, some way to get the destination without watching
the directory it moved to, so moves can be tracked without watching
every file on the system.


I am also interested in these features. As of now, my solutions are,

1) When the limit is reached, ask the user to increase the limit and 
restart the application.


2) When top level directory move is detected, do a file system search 
based on inode to find out the new location. Very slow and not fool proof.


I would also like to any other solutions for these problems. I am yet to 
look into fanotify.


-lijo

[leaving the rest for reference]



I understand that there are reasons of security and performance why
you cannot implement 1), but is 2) possible? Maybe by extending
IN_MOVED_TO, or adding a new event type?

2) is actually in some ways the more severe problem for us. As well as
being an indexer, nepomuk is a system that allows you to store file
metadata such as ratings. When users move the files, they want the
metadata to move too, so we need to track where the file moved, and
thus at the moment we recursively watch everything. This is
particularly problematic with removable media; because a lot of people
will plug in an external drive and then move files onto it, we have to
watch every drive as soon as it is plugged in. If we were able to get
the destination of move events without watching the destination
directory, we could watch only those directories with interesting
metadata in, which would make things a lot easier.

inotify move tracking would also be useful for other things - eg, a
text editor could use inotify to see if a file it has open has moved
and offer to re-open the file in its new location, which is impossible
at the moment.

Since the lack of recursive watches is really a problem because we
have a tendency to run out of watches, it would also really help if
the default limit was a bit higher -  most people seem to have > 8000
folders, but I suspect far fewer have > 32000 (probably excepting
those who are indexing kernel source trees: I have 21000, and half of
that is KDE source).

Would any of this be possible? If you happen to know of a better way
to track moves using existing tools, that would be even better.

Thanks,
Simeon
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: i915_hangcheck_hung problem with 3.8-rc2+ (Linus's latest tree)

2013-01-08 Thread Lijo Antony

On 01/09/2013 09:31 AM, Dave Airlie wrote:

On Wed, Jan 9, 2013 at 2:25 PM, Greg KH  wrote:

On Wed, Jan 09, 2013 at 01:42:39PM +1000, Dave Airlie wrote:

Hi all,

I've hit this 3 times today on Linus's latest 3.8-rc2+ tree:

[11868.414648] [drm:i915_hangcheck_hung] *ERROR* Hangcheck timer elapsed... GPU 
hung
[11868.414655] [drm] capturing error event; look for more information in 
/debug/dri/0/i915_error_state
[11870.408342] [drm:i915_hangcheck_hung] *ERROR* Hangcheck timer elapsed... GPU 
hung
[11870.408412] [drm:i915_reset] *ERROR* GPU hanging too fast, declaring wedged!
[11870.408414] [drm:i915_reset] *ERROR* Failed to reset chip.
[11883.083225] gnome-shell[19396]: segfault at 218 ip 7feef5f32333 sp 
7c1dc930 error 4 in i965_dri.so[7feef5ecb000+d]


I just hit this again.  And, as the kernel was asking for it, attached
is the i915_error_state file, compressed due to the size of it.


Welcome to sink hole that is
https://bugs.freedesktop.org/show_bug.cgi?id=55984

3 months and ticking, Intel guys are all running away from it saying
they can't reproduce, everyone else on planet seems to reproduce quite
easily.

Its generally considered a bug in the relocation/shrinker/no idea category,


Ugh, what a mess.


Assuming you have an Ironlake machine which I'm going to guess you do.


I don't know, it's an old i5 machine that has never had any video
problems for many years now.  How do I tell?


lspci -nn probably an 8086:0046 device.

Old i5 probably means original i5 which means ironlake.



I have also seen this a couple of times on 3.7 and 3.8-rc1.
Most of the times I was watching youtube video in chrome. Nothing 
crashed though(I am not running gnome shell). System recovered after few 
seconds.


I didn't see this on 3.8-rc2 yet, probably because I haven't watched any 
video.


-lijo



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 3/3] Staging: speakup: kobjects.c: checkpatch.pl fixes

2013-01-08 Thread Lijo Antony
Fixed two "line over 80 characters" warnings reported by checkpatch.pl

Signed-off-by: Lijo Antony 
---
 drivers/staging/speakup/kobjects.c |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/speakup/kobjects.c 
b/drivers/staging/speakup/kobjects.c
index 86387f4..35f647c 100644
--- a/drivers/staging/speakup/kobjects.c
+++ b/drivers/staging/speakup/kobjects.c
@@ -654,16 +654,16 @@ ssize_t spk_var_store(struct kobject *kobj, struct 
kobj_attribute *attr,
if (synth && synth->default_pitch) {
param = spk_var_header_by_name("pitch");
if (param)  {
-   spk_set_num_var(synth->default_pitch[value], 
param,
-   E_NEW_DEFAULT);
+   spk_set_num_var(synth->default_pitch[value],
+   param, E_NEW_DEFAULT);
spk_set_num_var(0, param, E_DEFAULT);
}
}
if (synth && synth->default_vol) {
param = spk_var_header_by_name("vol");
if (param)  {
-   spk_set_num_var(synth->default_vol[value], 
param,
-   E_NEW_DEFAULT);
+   spk_set_num_var(synth->default_vol[value],
+   param, E_NEW_DEFAULT);
spk_set_num_var(0, param, E_DEFAULT);
}
}
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 2/3] Staging: speakup: keyhelp.c: checkpatch.pl fixes

2013-01-08 Thread Lijo Antony
Breaking 2 lines to fit 80 char limit

Signed-off-by: Lijo Antony 
---
 drivers/staging/speakup/keyhelp.c |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/speakup/keyhelp.c 
b/drivers/staging/speakup/keyhelp.c
index 4c584ec..5091625 100644
--- a/drivers/staging/speakup/keyhelp.c
+++ b/drivers/staging/speakup/keyhelp.c
@@ -118,7 +118,8 @@ static void say_key(int key)
synth_printf(" %s", spk_msg_get(MSG_STATES_START + i));
}
if ((key > 0) && (key <= num_key_names))
-   synth_printf(" %s\n", spk_msg_get(MSG_KEYNAMES_START + (key - 
1)));
+   synth_printf(" %s\n",
+   spk_msg_get(MSG_KEYNAMES_START + (key - 1)));
 }
 
 static int help_init(void)
@@ -169,7 +170,9 @@ int spk_handle_help(struct vc_data *vc, u_char type, u_char 
ch, u_short key)
cur_item--;
else
return -1;
-   } else if (type == KT_SPKUP && ch == SPEAKUP_HELP && 
!spk_special_handler) {
+   } else if (type == KT_SPKUP
+   && ch == SPEAKUP_HELP
+   && !spk_special_handler) {
spk_special_handler = spk_handle_help;
synth_printf("%s\n", spk_msg_get(MSG_HELP_INFO));
build_key_data(); /* rebuild each time in case new mapping */
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 1/3] Staging: speakup: buffers.c: checkpatch.pl fixes

2013-01-08 Thread Lijo Antony
Fixed two camel case issues.

Signed-off-by: Lijo Antony 
---
 drivers/staging/speakup/buffers.c |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/speakup/buffers.c 
b/drivers/staging/speakup/buffers.c
index a2db956..382973e 100644
--- a/drivers/staging/speakup/buffers.c
+++ b/drivers/staging/speakup/buffers.c
@@ -5,12 +5,12 @@
 #include "speakup.h"
 #include "spk_priv.h"
 
-#define synthBufferSize 8192   /* currently 8K bytes */
+#define SYNTH_BUF_SIZE 8192/* currently 8K bytes */
 
-static u_char synth_buffer[synthBufferSize];   /* guess what this is for! */
+static u_char synth_buffer[SYNTH_BUF_SIZE];/* guess what this is for! */
 static u_char *buff_in = synth_buffer;
 static u_char *buff_out = synth_buffer;
-static u_char *buffer_end = synth_buffer+synthBufferSize-1;
+static u_char *buffer_end = synth_buffer + SYNTH_BUF_SIZE - 1;
 
 /* These try to throttle applications by stopping the TTYs
  * Note: we need to make sure that we will restart them eventually, which is
@@ -44,13 +44,13 @@ static void speakup_stop_ttys(void)
 
 static int synth_buffer_free(void)
 {
-   int bytesFree;
+   int bytes_free;
 
if (buff_in >= buff_out)
-   bytesFree = synthBufferSize - (buff_in - buff_out);
+   bytes_free = SYNTH_BUF_SIZE - (buff_in - buff_out);
else
-   bytesFree = buff_out - buff_in;
-   return bytesFree;
+   bytes_free = buff_out - buff_in;
+   return bytes_free;
 }
 
 int synth_buffer_empty(void)
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH 2/2] Staging: comedi: addi_common.h: checkpatch.pl fixes

2013-01-07 Thread Lijo Antony

On 01/08/2013 02:50 AM, H Hartley Sweeten wrote:

On Monday, January 07, 2013 3:40 PM, Greg KH wrote:

On Sat, Jan 05, 2013 at 06:12:55PM +0400, Lijo Antony wrote:

Reduced line lengths to 80 chars by removing extra spaces.

Signed-off-by: Lijo Antony 
---
  .../staging/comedi/drivers/addi-data/addi_common.h |   20 ++--
  1 file changed, 10 insertions(+), 10 deletions(-)





As you didn't do this for all fields in the structure, it's not really
worth doing it for just these, right?

The proper thing to do is use kerneldoc format and document it all at
the top of the structure, care to do that instead?


Hopefully I will soon get the rest of the addi-data drivers split off of the
addi_common stuff. This will effectively remove this header file so I'm
not sure it's worth making patches against it.


Ok, I will wait!
If the file is still around after your cleanup, I will make changes as 
per Greg's suggestion.


Thanks,
-lijo


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 2/2] Staging: comedi: addi_common.h: checkpatch.pl fixes

2013-01-05 Thread Lijo Antony
Reduced line lengths to 80 chars by removing extra spaces.

Signed-off-by: Lijo Antony 
---
 .../staging/comedi/drivers/addi-data/addi_common.h |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h 
b/drivers/staging/comedi/drivers/addi-data/addi_common.h
index 6d8b29f94..1996a68 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.h
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h
@@ -298,7 +298,7 @@ struct addi_private {
unsigned char b_AiInitialisation;
unsigned int ui_AiActualScan;   /* how many scans we finished */
unsigned int ui_AiBufferPtr;/*  data buffer ptr in samples */
-   unsigned int ui_AiNbrofChannels;/*  how many channels is 
measured */
+   unsigned int ui_AiNbrofChannels; /*  how many channels is measured */
unsigned int ui_AiScanLength;   /*  Length of actual scanlist */
unsigned int ui_AiActualScanPosition;   /*  position in actual scan */
unsigned int *pui_AiChannelList;/*  actual chanlist */
@@ -313,14 +313,14 @@ struct addi_private {
short *AiData;  /*  Pointer to sample data */
unsigned int ui_AiNbrofScans;   /*  number of scans to do */
unsigned short us_UseDma;   /*  To use Dma or not */
-   unsigned char b_DmaDoubleBuffer;/*  we can use double buffering 
*/
+   unsigned char b_DmaDoubleBuffer; /*  we can use double buffering */
unsigned int ui_DmaActualBuffer;/*  which buffer is used now */
/* UPDATE-0.7.57->0.7.68 */
/* unsigned int   ul_DmaBufferVirtual[2]; pointers to begin 
of DMA buffer */
short *ul_DmaBufferVirtual[2];  /*  pointers to begin of DMA buffer */
unsigned int ul_DmaBufferHw[2]; /*  hw address of DMA buff */
-   unsigned int ui_DmaBufferSize[2];   /*  size of dma buffer in bytes 
*/
-   unsigned int ui_DmaBufferUsesize[2];/*  which size we may now used 
for transfer */
+   unsigned int ui_DmaBufferSize[2]; /*  size of dma buffer in bytes */
+   unsigned int ui_DmaBufferUsesize[2]; /* size we may use for transfer */
unsigned int ui_DmaBufferSamples[2];/*  size in samples */
unsigned int ui_DmaBufferPages[2];  /*  number of pages in buffer */
unsigned char b_DigitalOutputRegister;  /*  Digital Output Register */
@@ -331,13 +331,13 @@ struct addi_private {
unsigned char b_ModeSelectRegister; /*  Contain data written at 
iobase + 0E */
unsigned short us_OutputRegister;   /*  Contain data written at 
iobase + 0 */
unsigned char b_InterruptState;
-   unsigned char b_TimerInit;  /*  Specify if InitTimerWatchdog was 
load */
-   unsigned char b_TimerStarted;   /*  Specify if timer 2 is running or 
not */
+   unsigned char b_TimerInit; /*  Specify if InitTimerWatchdog was load */
+   unsigned char b_TimerStarted; /* Specify if timer 2 is running or not */
unsigned char b_Timer2Mode; /*  Specify the timer 2 mode */
unsigned char b_Timer2Interrupt;/* Timer2  interrupt enable or 
disable */
-   unsigned char b_AiCyclicAcquisition;/*  indicate cyclic acquisition 
*/
+   unsigned char b_AiCyclicAcquisition; /*  indicate cyclic acquisition */
unsigned char b_InterruptMode;  /*  eoc eos or dma */
-   unsigned char b_EocEosInterrupt;/*  Enable disable eoc eos 
interrupt */
+   unsigned char b_EocEosInterrupt; /*  Enable disable eoc eos interrupt */
unsigned int ui_EocEosConversionTime;
unsigned char b_EocEosConversionTimeBase;
unsigned char b_SingelDiff;
@@ -353,7 +353,7 @@ struct addi_private {
unsigned char b_InterruptNbr;   /* Board interrupt number */
unsigned char b_SlotNumber; /* PCI slot number */
unsigned char b_BoardVersion;
-   unsigned int dw_MolduleConfiguration[4];/* Module 
config */
+   unsigned int dw_MolduleConfiguration[4];  /* Module config */
} s_BoardInfos;
 
/* Interrupt infos */
@@ -364,7 +364,7 @@ struct addi_private {
unsigned int ui_Write;  /* Write FIFO */
struct {
unsigned char b_OldModuleMask;
-   unsigned int ul_OldInterruptMask;   /* Interrupt 
mask */
+   unsigned int ul_OldInterruptMask;  /* Interrupt mask */
unsigned int ul_OldCounterLatchValue;   /* Interrupt 
counter value */
} s_FIFOInterruptParameters[APCI1710_SAVE_INTERRUPT];
} s_InterruptParameters;
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 1/2] Staging: comedi: addi_common.c: checkpatch.pl fixes

2013-01-05 Thread Lijo Antony
checkpatch.pl style fixes:
- Broken license text into 80 char lines
- fixed two space before tab issues
- Removed unnecessary braces from if-else

Signed-off-by: Lijo Antony 
---
 .../staging/comedi/drivers/addi-data/addi_common.c |   26 +---
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c 
b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index 90cc432..1051fa5 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -11,13 +11,21 @@ Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code 
of this module.
http://www.addi-data.com
i...@addi-data.com
 
-This program is free software; you can redistribute it and/or modify it under 
the terms of the GNU General Public License as published by the Free Software 
Foundation; either version 2 of the License, or (at your option) any later 
version.
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
 
-This program is distributed in the hope that it will be useful, but WITHOUT 
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License along with 
this program; if not, write to the Free Software Foundation, Inc., 59 Temple 
Place, Suite 330, Boston, MA 02111-1307 USA
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-You should also find the complete GPL in the COPYING file accompanying this 
source code.
+You should also find the complete GPL in the COPYING file accompanying this
+source code.
 
 @endverbatim
 */
@@ -29,10 +37,10 @@ You should also find the complete GPL in the COPYING file 
accompanying this sour
   | Tel : +49 (0) 7223/9493-0 | email: i...@addi-data.com |
   | Fax : +49 (0) 7223/9493-92| Internet : http://www.addi-data.com   |
   +---+
-  | Project   : ADDI DATA | Compiler : GCC   |
+  | Project   : ADDI DATA | Compiler : GCC|
   | Modulname : addi_common.c | Version  : 2.96   |
   +---+---+
-  | Author:   | Date :   |
+  | Author:   | Date :|
   +---+
   | Description : ADDI COMMON Main Module |
   +---+
@@ -167,11 +175,11 @@ static int addi_auto_attach(struct comedi_device *dev,
if (this_board->i_PCIEeprom) {
if (!(strcmp(this_board->pc_EepromChip, "S5920"))) {
/*  Set 3 wait stait */
-   if (!(strcmp(dev->board_name, "apci035"))) {
+   if (!(strcmp(dev->board_name, "apci035")))
outl(0x80808082, devpriv->i_IobaseAmcc + 0x60);
-   } else {
+   else
outl(0x83838383, devpriv->i_IobaseAmcc + 0x60);
-   }
+
/*  Enable the interrupt for the controller */
dw_Dummy = inl(devpriv->i_IobaseAmcc + 0x38);
outl(dw_Dummy | 0x2000, devpriv->i_IobaseAmcc + 0x38);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/