git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
drivers
/
ata
/
pata_ali.c
diff --git
a/drivers/ata/pata_ali.c
b/drivers/ata/pata_ali.c
index
dc61b72
..
f306e10
100644
(file)
--- a/
drivers/ata/pata_ali.c
+++ b/
drivers/ata/pata_ali.c
@@
-124,7
+124,7
@@
static unsigned long ali_20_filter(struct ata_device *adev, unsigned long mask)
ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num));
if (strstr(model_num, "WDC"))
return mask &= ~ATA_MASK_UDMA;
- return
ata_bmdma_mode_filter(adev, mask)
;
+ return
mask
;
}
/**