[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>

diff --git a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c
index bf91307a0bb2f5b6fdb926edb2ff1aebd8e4c157..8988f4fa9169f75036339fef6ab780a88095ed85 100644 (file)
--- 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 a49dc222b721f582e11b577f904bf227c519e761..cacc2578fa0406c84c4ad2fb1cfb1c1ec9eeef3f 100644 (file)
--- 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 17ee1b4ff087ee060a9e13a1a4bbe889c9623f22..584a27b2bbd5a5cfc4317356a28efb3b42ef427f 100644 (file)
--- 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)) {