diff options
| author | gregkh@suse.de <gregkh@suse.de> | 2005-05-06 08:54:20 -0700 |
|---|---|---|
| committer | Greg KH <gregkh@suse.de> | 2005-05-12 10:00:23 -0700 |
| commit | 5d6a280364977f262eee6db305b5059bbd2820e6 (patch) | |
| tree | 26a084b6a816e3ec78132f6ef58390235b896816 | |
| parent | bbba513736b2c653c1a0c664c684a68f083fe368 (diff) | |
| download | linux-stable-5d6a280364977f262eee6db305b5059bbd2820e6.tar.gz linux-stable-5d6a280364977f262eee6db305b5059bbd2820e6.tar.bz2 linux-stable-5d6a280364977f262eee6db305b5059bbd2820e6.zip | |
[PATCH] Cset exclude: khali@linux-fr.org[gregkh]|ChangeSet|20050430010004|65088
Revert the msdos.c patch as it causes more problems than it helps right now.
(it got munged together with the i2c patch also, stupid scripts...)
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/i2c/chips/it87.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/chips/via686a.c | 2 | ||||
| -rw-r--r-- | fs/partitions/msdos.c | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c index bf91307a0bb2..8988f4fa9169 100644 --- a/drivers/i2c/chips/it87.c +++ b/drivers/i2c/chips/it87.c @@ -631,7 +631,7 @@ static ssize_t show_alarms(struct device *dev, char *buf) struct it87_data *data = it87_update_device(dev); return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms)); } -static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); +static DEVICE_ATTR(alarms, S_IRUGO | S_IWUSR, show_alarms, NULL); static ssize_t show_vrm_reg(struct device *dev, char *buf) diff --git a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c index a49dc222b721..cacc2578fa04 100644 --- a/drivers/i2c/chips/via686a.c +++ b/drivers/i2c/chips/via686a.c @@ -554,7 +554,7 @@ static ssize_t show_alarms(struct device *dev, char *buf) { struct via686a_data *data = via686a_update_device(dev); return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms)); } -static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); +static DEVICE_ATTR(alarms, S_IRUGO | S_IWUSR, show_alarms, NULL); /* The driver. I choose to use type i2c_driver, as at is identical to both smbus_driver and isa_driver, and clients could be of either kind */ diff --git a/fs/partitions/msdos.c b/fs/partitions/msdos.c index 17ee1b4ff087..584a27b2bbd5 100644 --- a/fs/partitions/msdos.c +++ b/fs/partitions/msdos.c @@ -114,9 +114,6 @@ parse_extended(struct parsed_partitions *state, struct block_device *bdev, */ for (i=0; i<4; i++, p++) { u32 offs, size, next; - - if (SYS_IND(p) == 0) - continue; if (!NR_SECTS(p) || is_extended_partition(p)) continue; @@ -433,8 +430,6 @@ int msdos_partition(struct parsed_partitions *state, struct block_device *bdev) for (slot = 1 ; slot <= 4 ; slot++, p++) { u32 start = START_SECT(p)*sector_size; u32 size = NR_SECTS(p)*sector_size; - if (SYS_IND(p) == 0) - continue; if (!size) continue; if (is_extended_partition(p)) { |